summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2013-02-13Merge from viewer-betaprep
2013-02-12mergeNyx Linden
2013-02-12SH-3859 FIX adding or removing clothing in appearance edit mode are visibleNyx Linden
Added check to cancel any appearance update requests that occur while in appearance edit mode. Closing appearance edit mode does trigger an update, so should be safe to cancel intermediate requests without further changes.
2013-02-12SH-3852 WIP - removed agent_id from summary packetsBrad Payne (Vir Linden)
2013-02-12removed some redundant or deprecated timersBrad Payne (Vir Linden)
2013-02-12SH-2852 WIP - track avatar loading via load_<foo> timers, added distinction ↵Brad Payne (Vir Linden)
between partially and fully loaded textures
2013-02-12SH-3852 WIP - added more specific logging of completenesss of texture loadingBrad Payne (Vir Linden)
2013-02-11fix for build failure on test w/linuxBrad Payne (Vir Linden)
2013-02-11fix for mac build failureBrad Payne (Vir Linden)
2013-02-11mergeBrad Payne (Vir Linden)
2013-02-11SH-3852 WIP - removed avatar metrics from ViewerAssetMetricsBrad Payne (Vir Linden)
2013-02-08SH-3852 WIP - bucketize stats by agent_id, grid coordinates and various ↵Brad Payne (Vir Linden)
other criteria
2013-02-07SH-3852 WIP - track per-timer statsBrad Payne (Vir Linden)
2013-02-07SH-3852 WIP - small tweaksBrad Payne (Vir Linden)
2013-02-06mergeNyx Linden
2013-02-06SH-3651 FIX Beard edits not applying on server bakesNyx Linden
Despite incrementing the COF version, beard edits were not updating the head hash. We were not applying layers/parameters to the baked texture hashes for layers that did not contain a user-defined image. However, many layers have standard morph masks, etc that are affected by wearable parameters. Edited the LLTexLayerInterface::getWearable() method to return the proper wearable type if there is no associated local texture index, and all parameters in the wearable refer to a particular wearable type. Should be safe even if some (but not all) params have no wearable type defined.
2013-02-05merge changes for DRTVWR-297Oz Linden
2013-02-04MAINT-2323 Fix for crash on shutodwn in mesh responder destructorsDave Parks
2013-02-01SH-3800 WIP - additional log lineBrad Payne (Vir Linden)
2013-02-01SH-3800 WIP - additional log lineBrad Payne (Vir Linden)
2013-02-01SH-3800 WIP - fixed bad case in appearance version computationBrad Payne (Vir Linden)
2013-02-01SH-3800 WIP - log some of sent appearance msg info as well as receivedBrad Payne (Vir Linden)
2013-02-01SH-3800 WIP - reject appearance messages with contradictory appearance ↵Brad Payne (Vir Linden)
version info
2013-02-01STORM-1930 Quality & Speed slider has Ultra label where High should be.Whirly
2013-01-31mergeBrad Payne (Vir Linden)
2013-01-30SH-3800 WIP - avoid complaints about source of various standard textures - ↵Brad Payne (Vir Linden)
IMG_DEFAULT_AVATAR etc
2013-01-30SH-3800 WIP - logic to detect baked textures being sought in the wrong ↵Brad Payne (Vir Linden)
place, avoid querying textures for which we have no authoritative data where they live
2013-01-30SH-3800 WIP - flag mismatched expectations for baked texture originsBrad Payne (Vir Linden)
2013-01-30SH-3780 WIP - more checking on appearance param valuesBrad Payne (Vir Linden)
2013-01-29MAINT-2281: correct test for XP (corrected fix I applied incorrectly)Oz Linden
2013-01-29SH3530: Removed extra ServerAppearanceUpdate()prep@lindenlab.com
2013-01-28mergeBrad Payne (Vir Linden)
2013-01-28SH-3779 WIP, SH-3534 WIP - more bake-status trackingBrad Payne (Vir Linden)
2013-01-26[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate entry from panel_preferences_general.xml
2013-01-25[MAINT-2233] Duplicate entries in notifications.xmlChris Baker
- Removed duplicate notification elements
2013-01-29MAINT-2281: correct test for XPcallum_linden
2013-01-28For MAINT-2276 a workaround to unblock 3.4.5 beta review: tedGraham Madarasz (Graham)
2013-01-25BUILDFIX: merge cleanupNyx Linden
A couple of merge issues that caused the resulting code to not build.
2013-01-25merge changes for DRTVWR-290Oz Linden
2013-01-25SH-3779 WIP - less verbose appearance dumps, keep appearance version visual ↵Brad Payne (Vir Linden)
param in sync with mUseServerBakes
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break tanks. Reverts MAINT-1742
2013-01-24SH-3779 WIP - handling of appearance version paramBrad Payne (Vir Linden)
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentNat Goodspeed
2013-01-24MAINT-2277 Yellow "fence" (selection) of the parcel doesn't update after ↵Kelly Washington
selecting the other parcel * Removed bogus check on matching parcel data coming in.
2013-01-24MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksetsKelly Washington
2013-01-23SH-3779 WIP - fully parse appearance message before trying to do anything ↵Brad Payne (Vir Linden)
with it
2013-01-23SH-3534 WIP - better encapsulation of mUseServerBakesBrad Payne (Vir Linden)
2013-01-23fixes and updates to DebugAvatarAppearanceMessage status lineBrad Payne (Vir Linden)