summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2010-12-21Automated merge up from viewer-developmentLoren Shih
2010-12-21SH-689 Fix build issue due to assert i llviewerassetstatsLoren Shih
Changed assert to 50 since that's the new asset count. Added OTHER metrics for mesh and dummy asset types.
2010-12-21Automated merge up from viewer-developmentLoren Shih
2010-12-21Automated merge from mesh-developmentLoren Shih
2010-12-20model upload wizard - added optimization and state changesleyla_linden
2010-12-20Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-12-20SH-68 WIP adding debug switch for performance testingNyx (Neal Orman)
Adding functionality to a previously added debug switch. This will allow me to have UI, etc turned off and thus not impact framerates when testing for rendering features.
2010-12-20mergeBrad Payne (Vir Linden)
2010-12-20SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved ↵Brad Payne (Vir Linden)
onIdle functions to llcallbacklist.
2010-12-20Fix for windows build. Reviewed by Nyx.Dave Parks
2010-12-20thread safety checkingBrad Payne (Vir Linden)
2010-12-20Merge - final pull of viewer-development.Monty Brandenberg
2010-12-20Automated merge up from viewer-developmentLoren Shih
2010-12-20merge fix for storm-412Oz Linden
2010-12-20merge fix for storm-801Oz Linden
2010-12-20merge fix for storm-796Oz Linden
2010-12-18STORM-511 FIXED Display tooltip for sender name on group notices.Vadim ProductEngine
Changes: * Set tooltip for sender name. * Overridden handleTooltip() for the tooltip to be of normal (yellow) color.
2010-12-18Merge STORM-796Vadim ProductEngine
2010-12-18STORM-796 ADDITIONAL_FIX Fixed Mac build.Vadim ProductEngine
2010-12-18STORM-412 FIXED Resident profile controls aren't reshaped on changing panel ↵Paul Guslisty
width - Added parameters for text boxes to follow right side of panel
2010-12-18STORM-801 FIXED Wrong checkbox label in panel preferences, advanced tabPaul Guslisty
- Corrected checkbox label
2010-12-17Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2010-12-17merging in fix for CTS-323 / SH-464Nyx (Neal Orman)
2010-12-17SH-558 Fix for crash in physics shape display.Dave Parks
2010-12-17Merge from viewer-development post 2.4 releaseMonty Brandenberg
2010-12-17SH-506 Remove (now obsolete) streaming cost info display.Dave Parks
2010-12-17SH-682 WIP: allow DEBUG_FAST_TIMER_THREADS to work when enabledBrad Payne (Vir Linden)
2010-12-16ESC-237 No static init of LLAtomics and move TFRequest out of unnamed namespace.Monty Brandenberg
Linux startup crash appears to be due to static/global C++ init of LLAtomic types. The initializer with explicit value makes some runtime calls and it looks like these assume, at least on Linux, that apr_initialize() has been called. So move the static POST count to a member and provide accessors and increment/decrement. Command queue was built on a pointer to a class in anonymous namespace and that's not quite valid. Made it a nested class (really a nested forward declaration) while keeping the derived classes in anonymous.
2010-12-16merge fix for storm-529Oz Linden
2010-12-16merge fix for storm-776Oz Linden
2010-12-16STORM-796 FIXED Implemented rendering /app/region/ SLapps into ↵Vadim ProductEngine
human-readable strings. Example: secondlife:///app/region/Ahern/10/20/30/ is displayed as "Ahern (10,20,30)".
2010-12-16Automated merge up from viewer-developmentLoren Shih
2010-12-16STORM-529 FIXED Added Undo/Redo items to the Build menu.Vadim ProductEngine
2010-12-16STORM-771 FIXED Pasting wearable items from clipboard to Current Outfit or ↵Seth ProductEngine
an outfit folder now creates links to these items.
2010-12-15SH-594 - added an extra redundant check for nameless nodesBrad Payne (Vir Linden)
2010-12-15SH-594 FIX: added check for nameless nodesBrad Payne (Vir Linden)
2010-12-15ESC-235 Truncation of over-sized metrics reports wasn't working.Monty Brandenberg
Legacy of the LLSD::Map-to-LLSD::Array conversion, this ended up performing an erase on the array rather than the map taking out all the regions. So, there *was* a metrics report, it was just empty of regions. Fixed and scanned for more array/map problems and corrected the data type for duration sorts (should have been Real).
2010-12-15STORM-800 FIXED Crash in LLRemoteParcelInfoProcessor::processParcelInfoReply()Kitty Barnett
2010-12-15STORM-799 FIXED Crash in LLVivoxVoiceClient::notifyStatusObservers()Kitty Barnett
2010-12-15pulling fixes back from viewer-betaOz Linden
2010-12-15STORM-776 : unable to change permissions to "no trans" on item in avatar ↵Wolfpup Lowenhar
inventory applied Kitty's code changes listed in STROM-288 as it is a related issue and this actualy fixed both issues!
2010-12-15MergeKent Quirk
2010-12-15STORM-786 ADDITIONAL FIX Fixed Windows build.Vadim ProductEngine
2010-12-15STORM-786 FIXED Fixed disappearing controls in avatar picks list.Vadim ProductEngine
Caused by an improper fix of STORM-690. Made the way we switch between profile view panels (profile view / pick_info / pick_edit) more robust. It now suits both My Profile and Profile View panels.
2010-12-14mergeBrad Payne (Vir Linden)
2010-12-14SH-439 FIX: track name requested in UI separately, so we can fall back to ↵Brad Payne (Vir Linden)
name from dae if needed
2010-12-14VWR-24263: Crash fix for notecards with negative text lengthKadah_Coba
2010-12-14BUILDFIX uninitialized variableNyx (Neal Orman)
a potentially uninitialized variable is causing the linux build to fail. Initializing the value to 0, as its our best guess for what it should be, as davep is currently out sick.
2010-12-14merge fix for storm-713Oz Linden
2010-12-14merge fix for storm-401Oz Linden