summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-12-07merge changes for vmrg-198Oz Linden
2011-12-07merge changes for vmrg-199Oz Linden
2011-12-06merge changes for storm-1713Oz Linden
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-05STORM-1713: Mouse pointer flickers when hovering over any active/clickable ↵Ansariel
UI item
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-02storm-1717: fix avatar names in object details floaterAnsariel Hiller
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-01FIX VWR-25381eli
2011-12-01Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
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-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
2011-12-01STORM-1721 Set UI Size to Default Option Duplicated in Advanced MenuJonathan Yap
2011-11-30sync with viewer-developmenteli
2011-11-30increment viewer version to 3.2.5Oz Linden
2011-11-30merge changes for vmrg-195Oz Linden
2011-11-30merge changes for vmrg-194Oz Linden
2011-11-30EXP-1634 FIXED Removed the "exchange rates" link from the L$ Buy Dialog.Vadim ProductEngine
2011-11-30STORM-1719 notifications.xml has two instances where a button shows as "Ok" ↵Jonathan Yap
and Not "OK"
2011-11-30EXP-1641 FIXED Snapshot floater doesn't persist between sessions anymore to ↵Vadim ProductEngine
avoid capturing login screen.
2011-11-30EXP-1640 FIXED Fixed weirdly looking Snapshot floater in Italian and French ↵Vadim ProductEngine
locales.
2011-11-29sync with viewer-developmenteli
2011-11-28mergeBrad Payne (Vir Linden)
2011-11-23merge changes for vmrg-192Oz Linden
2011-11-23merge changes for vmrg-190Oz Linden
2011-11-23STORM-591 Trivial code cleanupJonathan Yap
2011-11-22STORM-591 Remove 2 development debug settings and replace them with constantsJonathan Yap
2011-11-22merge changes for vmrg-191Oz Linden
2011-11-21FIX INTL-82 LQA changes for Turkish and Frencheli
2011-11-21sync with viewer-developmenteli
2011-11-21merge changes for storm-1634Oz Linden
2011-11-21merge up to latest viewer-developmentOz Linden
2011-11-21merge changes for storm-1634Oz Linden
2011-11-21merge changes for vmrg-189Oz Linden
2011-11-21merge changes for vmrg-188Oz Linden
2011-11-21merge changes for storm-1684Oz Linden