Xiaohong Bao
f20fadeafa
fix a texture issue that unpaused callbacks never get fired.
2013-10-08 15:23:47 -06:00
Xiaohong Bao
b0c85e250d
Automated merge with https://bitbucket.org/lindenlab/sunshine-internal
2013-09-23 17:04:05 -06:00
Xiaohong Bao
259394b541
fix the bug that texture aux channel data can not be reloaded.
2013-09-23 17:03:19 -06:00
Nyx Linden
e106dad438
merge
2013-09-20 15:55:38 -04:00
Nyx Linden
7e7965af19
SH-3943 FIX beard morph masks applied inconsistently on login to server bake region
...
Looks like we were caching bad morph masks that were generated on login. Adjusting
algorithms to always replace the cache when we have invalidated the other channels
of the baked texture.
2013-09-20 15:54:26 -04:00
Logan Dethrow
0bb3f482af
Backed out revision 9038e63bc38d, which added viewer version information to what is sent in an appearance metric message. We are taking another approach to get the same information in a more consistent, reliable way.
2013-09-18 18:34:44 -04:00
Don Kjer
c2ddc68afe
Updating AISv3 api to match recent changes
2013-09-17 22:30:02 -07:00
Brad Payne (Vir Linden)
25b078f968
log spam cleanup
2013-09-13 11:18:28 -04:00
Brad Payne (Vir Linden)
dad3090afc
SH-4422 WIP - avoid redundant calls to updateAppearanceFromCOF() if rezzing an attachment that's already linked in COF
2013-09-11 10:45:14 -04:00
Don Kjer
683c36ae2f
Automated merge
2013-09-10 14:59:33 -07:00
Don Kjer
3a44c5c2a3
Fix for SH-4470 when modifying (no copy) or (no transfer) wearables.
2013-09-10 14:58:40 -07:00
Brad Payne (Vir Linden)
e6a68e1f09
merge
2013-09-10 15:30:13 -04:00
Don Kjer
f878b032e8
Using transaction_id instead of raw asset_id during aisv3 patch
2013-09-09 13:13:22 -07:00
Oz Linden
55ae6a7962
increment viewer version to 3.6.6
2013-09-09 14:47:01 -04:00
Oz Linden
938e201d8f
Added tag 3.6.5-release for changeset bf6d45304601
2013-09-09 14:45:03 -04:00
Brad Payne (Vir Linden)
144eb1912d
merge
2013-09-04 13:41:51 -04:00
Nyx Linden
cda8a75dd6
merge
2013-08-30 19:05:58 -04:00
Nyx Linden
726a26d4bc
SH-4458 FIX "Pant flares rendering as tights after SSA rollout"
...
probably not related to SSA rollout, but we were not triggering the
callbacks for baked texture loads, since the avatar object was adding
paused callbacks to the callback list without properly setting the
flag to indicate paused callbacks.
2013-08-30 19:05:23 -04:00
Brad Payne (Vir Linden)
497e84202e
SH-4456 FIX - added info to metrics for viewer version tags.
2013-08-30 11:14:17 -04:00
Brad Payne (Vir Linden)
f426f8a694
SH-4455 WIP - versioned some metrics whose usage has changed, added name and item id checks in setWearableOutfit()
2013-08-29 17:08:30 -04:00
Brad Payne (Vir Linden)
3a0cd466f1
SH-4455 WIP - restrict use of LLWearableHoldingPattern metrics. When changing wearables, bail out if current wearables already match those requested.
2013-08-29 14:59:40 -04:00
Oz Linden
a359d9d80c
merge changes for 3.6.4-release
2013-08-27 10:37:02 -04:00
Oz Linden
6e1138585b
increment viewer version to 3.6.5
2013-08-26 14:55:37 -04:00
Oz Linden
08f5d3d7c0
Added tag 3.6.4-release for changeset 91ed595b716f
2013-08-26 14:52:03 -04:00
Graham Madarasz (Graham Linden)
f46e07c14c
MAINT-1453 ifdef around windows-only work-around to restore 8x and 16x AA modes on Mac
2013-08-26 10:16:11 -07:00
Brad Payne (Vir Linden)
a3b1a60ed7
merge
2013-08-22 16:12:40 -04:00
Oz Linden
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
Oz Linden
82bf4e4db2
merge changes for DRTVWR-285
2013-08-19 15:15:15 -04:00
Oz Linden
731fe3e7c6
merge changes for 3.6.3-release
2013-08-19 15:14:23 -04:00
Oz Linden
171089207b
increment viewer version to 3.6.4
2013-08-19 14:51:04 -04:00
Oz Linden
739327bb02
Added tag 3.6.3-release for changeset fe4f7c5e9fd2
2013-08-19 14:50:38 -04:00
Brad Payne (Vir Linden)
0094c4299f
moved LLTrackPhaseWrapper to do its work in destructor
2013-08-19 14:49:11 -04:00
Nyx Linden
cc999b225e
merge cleanup, making sure our branch has the latest autobuild changes.
2013-08-19 11:55:49 -04:00
Nyx Linden
f669fdaf81
merge cleanup - one file did not merge cleanly.
2013-08-16 19:47:58 -04:00
Nyx Linden
2c99777942
merge
2013-08-16 19:31:36 -04:00
Nyx Linden
5ae117aff6
merge with viewer-release
2013-08-16 19:31:16 -04:00
maksymsproductengine
53eff025bc
MAINT-2938 FIXED [CHUI] crash in LLFloaterConversationPreview::showHistory()
2013-08-15 20:24:02 +03:00
Mnikolenko ProductEngine
22140012c2
MAINT-3012 FIXED Don't show Destination Guide by default on first run.
2013-08-15 12:37:24 +03:00
Brad Payne (Vir Linden)
2157cf5e71
SH-4422 FIX - fixed some recently introduced issues with link description fields, which among other things reduces the number of appearance requests sent.
2013-08-14 14:25:22 -04:00
Nicky
e7bc0e6e63
BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars.
2013-08-14 01:00:41 +02:00
maksymsproductengine
6505ddb204
MAINT-2937 FIXED [CHUI] crash in LLToastIMPanel
2013-08-13 20:25:49 +03:00
Brad Payne (Vir Linden)
4961ee03c7
merge
2013-08-12 13:46:25 -04:00
Brad Payne (Vir Linden)
6128cd9f70
cat version debug statement
2013-08-12 13:45:51 -04:00
Don Kjer
8abd6ed6b8
Automated merge.
2013-08-09 14:53:22 -07:00
Don Kjer
c1af1a692a
Routing link creating through AISv3 when available.
2013-08-09 14:52:54 -07:00
Don Kjer
3ed3b88892
Refactoring link creation calls in preparation for adding AIS v3 hook.
2013-08-09 13:36:36 -07:00
Logan Dethrow
8f05828038
Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal
2013-08-08 17:13:59 -04:00
Logan Dethrow
0e8a966f3b
Moved commented out capabilities debugging code into ifdef'd block and added a comment describing the use of it.
2013-08-08 17:13:53 -04:00
Nyx Linden
faa0866ca3
SH-4401 FIX back-end changes to handle new visual param groups.
2013-08-08 13:21:18 -04:00
Oz Linden
86b4019684
merge changes for DRTVWR-333
2013-08-07 12:17:39 -04:00