summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-12-07mergeBrad Payne (Vir Linden)
2011-12-07mergeBrad Payne (Vir Linden)
2011-12-07merge changes for vmrg-198Oz Linden
2011-12-07merge changes for vmrg-199Oz Linden
2011-12-06Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-12-06fix for SH-2526: Second Life client quickly allocates all available RAM and ↵Xiaohong Bao
crashes
2011-12-06merge changes for storm-1713Oz Linden
2011-12-06Fix for RenderResolutionDivisor no longer working correctly.Dave Parks
2011-12-06merge changes for storm-1712Oz Linden
2011-12-06merge changes for storm-591Oz Linden
2011-12-06merge changes for storm-1728Oz Linden
2011-12-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-12-06merge latest viewer-developmentOz Linden
2011-12-06STORM-1728 Name truncation in the Region/Estate floater -> Covenant tabJonathan Yap
2011-12-06LLSD-14: Extract remaining conditional LLSD mbrs to namespace llsd.Nat Goodspeed
Per Monty's code review, it's dubious practice to have a class in which certain members are sometimes visible, other times not. If these were virtual methods, or non-static data members, the error would be obvious -- but even with static data members and non-virtual methods, it looks like an ODR violation. Extract conditional methods as free functions, as in changeset 07cd70e75473.
2011-12-06merge changes for vmrg-196Oz Linden
2011-12-05SH-2652 Bump fast timer location.Dave Parks
2011-12-05mergeDave Parks
2011-12-05SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while ↵Dave Parks
occlusion queries from previous frame are still pending and perform texture decode work.
2011-12-05Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-12-05call LLViewerTexture::isMemoryForTextureLow() less often and only for ATI cards.Xiaohong Bao
2011-12-05STORM-1713: Mouse pointer flickers when hovering over any active/clickable ↵Ansariel
UI item
2011-12-05SH-2747 FIXBrad Payne (Vir Linden)
2011-12-05Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-12-05fix for sh-2738: Texture fetching freezes due to LLcurlXiaohong Bao
2011-12-05mergeDave Parks
2011-12-05mergeBrad Payne (Vir Linden)
2011-12-05LLSD-14: Optional entry points need conditional decls turned on.Nat Goodspeed
Changeset 07cd70e75473 moved LLSD::outstandingCount() and allocationCount() to free functions so we could turn their visibility on/off via LLSD_DEBUG_INFO. But on some platforms, without proper LL_COMMON_API declarations visible when we compile llsd.cpp, those free functions lack proper linkage directives. Declare LLSD_DEBUG_INFO in llsd.cpp so that when the llcommon library is built, the free functions get proper linkage -- independent of compilations of LLSD consumers.
2011-12-05STORM-591 Made change per code review request: disable audio when teleport ↵Jonathan Yap
progress bar is present Added code to start counting the fade in time on login when STATE_STARTED is set
2011-12-02FIX VWR-17784eli
2011-12-02FIX VWR-17783 fix html entityeli
2011-12-02FIX VWR-17783eli
2011-12-02STORM-1712 Do not sort recent speakers list if mouse is hovered over itJonathan Yap
2011-12-02fix for SH-2512: Some avatar textures in welcome area never load on first visitXiaohong Bao
2011-12-02storm-1717: fix avatar names in object details floaterAnsariel Hiller
2011-12-02EXP-1654 FIX fast timers does not show entire frame when Full bar = MaxRichard Linden
2011-12-02SH-1912 Tweak based on QA/resident feedbackDave Parks
2011-12-02STORM-591 Made mininum fade time 0.01 seconds to prevent divide by zero and ↵Jonathan Yap
negative fade times. Rewrote two blocks of code to eliminate early returns.
2011-12-01Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-12-01ER-1473: fix teleporting in sit mode. Viewer fix - reviewed by CallumSimon Linden
2011-12-01SH-2726 FIX -- Texture Console and Debug Console inaccessableLeslie Linden
* Removed debug view post build step and moved initialization to first draw for proper setup.
2011-12-01FIX VWR-25381eli
2011-12-01Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-12-01fix for sh-2735: LLCurl causes SL to freeze when logoutXiaohong Bao
2011-12-01LLSD-14: Move LLSD::(outstanding|allocation)Count() to free functions.Nat Goodspeed
Free functions can be unconditionally compiled into the .o file, but conditionally hidden in the header file. Static class methods don't have that flexibility: without a declaration in the header file, you can't compile a function definition in the .cpp file. That makes it awkward to use the same llcommon build for production and for unit tests. Why make the function declarations conditional at all? These are debugging functions. They break the abstraction, they peek under the covers. Production code should not use them. Making them conditional on an #ifdef symbol in the unit-test source file means the compiler would reject any use by production code. Put differently, it allows us to assert with confidence that only unit tests do use them. Put new free functions in (lowercase) llsd namespace so as not to clutter global namespace. Tweak the one known consumer (llsd_new_tut.cpp) accordingly.
2011-12-01Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-12-01fix for SH-2560: Nearby avatar textures fail to loadXiaohong Bao
and SH-2671: sometimes other avatar textures don't load
2011-12-01merge changes for storm-1719Oz Linden
2011-12-01merge changes for storm-1686Oz Linden
2011-12-01storm-1686: make "Neck" and "Avatar Center" attach points available in ↵Oz Linden
context menus