summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-06-11Merge from 2.1 Alpha tagDessie Linden
2010-06-07MergeLeyla Farazha
2010-06-07EXT-7210 Baked textures should only be updated when outfit changes are saved ↵Leyla Farazha
or outfit editor is exited. reviewed and contributed to by Nyx
2010-06-07EXT-7380 - 'Call' and 'Group Call' verb buttons remain enabled on avatar/groupRoxie Linden
profile page after Voice chat was disabled in 'Preferences' There was a missing listener notification when enabling/disabling voice CR (actualy, took code from) Valeriy ProductEngine
2010-06-07Merge from viewer-publicDessie Linden
2010-06-07merge backoutTofu Linden
2010-06-07EXT-7145: FIXED: make viewer to handle "URL redirect " for http texture.Tofu Linden
Backed out changeset e6feef9704cf to re-introduce Bao's fix
2010-06-07automated mergeLoren Shih
2010-06-04Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicXiaohong Bao
2010-06-04EXT-7500: PARTIAL FIXED: Texture Jamming problems with http texture offXiaohong Bao
2010-06-04mergeRichard Nelson
2010-06-04EXT-7492 FIX Invalid previews are loaded for body parts in the Appearance SPRichard Nelson
reviewed by Nyx
2010-06-04EXT-7452: FIXED: gray squares on the world map (nothing to do with map server)Xiaohong Bao
2010-06-04VWR-19699 Correct "wear" and "add" behaviorNyx (Neal Orman)
added "add" menu item to clothing right-click menus and corrected "wear" to mean "replace top wearable of this type" reviewed by Richard
2010-06-04Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-06-04AVP-44 VWR-19699 FIX Multi-wearables and wearable replacement logicNyx (Neal Orman)
Cleaned up a few things upon code review. Code reviewed by vir for this checkin as well as following previous commits: a801af3728ee af42810b946c
2010-06-04Fix for EXT-7571 (Camera is left in object view mode after leaving "edit ↵Monroe Linden
appearance" mode) Call gAgentCamera.resetView() when exiting appearance/outfit editing mode.
2010-06-04Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicRichard Nelson
2010-06-04mergeRichard Nelson
2010-06-04DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the ↵Richard Nelson
viewer reviewed by Mani
2010-06-04MergeEli Linden
2010-06-04EXT-7545 FIX remove untranslatable strings; add translate="false" to en xuiEli Linden
2010-06-04EXT-7626 FIXED INFRASTRUCTURE LLTexLayer code cleanupLoren Shih
Cleaned up readBackAndUpload and added better comments.
2010-06-04MergeLeyla Farazha
2010-06-04EXT-7502 Save as option while modifiying a body part doesn't prompt for ↵Leyla Farazha
name, and just saves changes. reviewed by Nyx
2010-06-04made LLStringUtil::null constRichard Nelson
2010-06-04automated mergeLoren Shih
2010-06-04EXT-7526 WIP Add baked texture information to texture viewLoren Shih
More informative logic added in to track when an upload is actually happening. Did some minor reformatting.
2010-06-04Fix for the last part of EXT-7366 (Need to change camera view of avatar ↵Monroe Linden
previews on 'Front view' while editing shapes). Reviewed by Richard.
2010-06-04EXT-7526 WIP Add baked texture information to texture viewLoren Shih
Minor logic fix for status display.
2010-06-04EXT-7526 WIP Add baked texture information to texture viewLoren Shih
Added color, emphasis, and more information to texture view.
2010-06-04EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Trivial change to texture debug readout.
2010-06-04EXT-7533: FIX for 7800 in gpu table. and added nvidia ion. No code changedPalmer Truelson
2010-06-04EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Added fix for logic behind resetting upload timer.
2010-06-04EXT-7342 FIXED Updated the link to the Voice Morphing marketing page.Aimee Linden
This link will be broken until the official page goes live.
2010-06-04Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicRichard Nelson
2010-06-04removed duplicate winmm entry for debug buildsRichard Nelson
2010-06-04Merged from viewer-publicDessie Linden
2010-06-04Merged from viewer-publicDessie Linden
2010-06-04Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-06-04automated mergeLoren Shih
2010-06-04EXT-7504 WIP Force decloud after timeout using lower res texturesLoren Shih
Added hack for testing lower texture discard level performance. Enabled LowResTextures timeout.
2010-06-04EXT-7628 FIXED Don't cache lower res baked texturesLoren Shih
Changed hash mangling algorithm slightly.
2010-06-04Fix a long-suffering logging unit test failure, re-enable the test.Tofu Linden
This makes logs look less scary on Linux, in-line with other platforms.
2010-06-04merge from PE's viewer-trunkTofu Linden
2010-06-03AVP-44 WIP Multi-wearables architectureNyx (Neal Orman)
One step closer to full support of multi-wearables architecture code will be reviewed before pushing.
2010-06-03Automated merge with ssh://hg.lindenlab.com/dessie/viewer-publicNyx (Neal Orman)
2010-06-03VWR-19699 WIP Correct operations for wear and replace on wearablesNyx (Neal Orman)
Resident-submitted patch, cleaned up so it matches style and compiles/builds well. Appears to work for stated goals but will need some more UI work to ensure consistency. WIP checkin, will be code reviewed before pushing.
2010-06-03Code cleanup in LLPanelEditWearable, from Nyx.Monroe Linden
Removed the misnamed LLPanelEditWearable::initializePanel() (which was actually being called multiple times for each object), and moved its functionality to postBuild() and showWearable().
2010-06-03mergeRichard Linden