summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-12-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
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-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-02FIX VWR-17784eli
2011-12-02FIX VWR-17783 fix html entityeli
2011-12-02FIX VWR-17783eli
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-11-30sync with viewer-developmenteli
2011-11-30increment viewer version to 3.2.5Oz Linden
2011-11-30Added tag 3.2.4-start for changeset 3fe994349faeOz 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-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-28merge changes for vmrg-193Oz Linden
2011-11-28mergeBrad Payne (Vir Linden)
2011-11-24merge changes for vmrg-193Oz Linden
2011-11-23merge changes for vmrg-192Oz Linden
2011-11-23merge changes for vmrg-190Oz Linden
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-21update build paramsOz Linden
2011-11-21merge changes for storm-1684Oz Linden
2011-11-21Add "Use Region Settings" to World->Sun menuTofu Buzzard
2011-11-21merge changes for storm-1663Oz Linden
2011-11-21merge changes for storm-1679Oz Linden
2011-11-21EXP-1630 FIXED Only show snapshot size spinners and "Constrain proportions" ↵Vadim ProductEngine
checkbox when Custom resolution is selected.
2011-11-19Make LLSD diagnostic methods conditional on LLSD_DEBUG_INFO.Nat Goodspeed
This establishes that there are no viewer-side unit tests relying on these methods. The point is to try to clean up the LLSD public API. In the same vein, remove from LLSD public API a diagnostic method which is nothing more than an implementation detail for the corresponding LLSD::Impl method. The same effect can be achieved by making LLSD::Impl a friend of LLSD, moving the method with the messy signature (classic-C arrays!) into LLSD::Impl itself.
2011-11-18pull back 3.2.2 beta 2 fixesOz Linden
2011-11-18mergeDave Parks
2011-11-18SH-2700 Fix for random black textures due to texture index out of bounds. ↵Dave Parks
Also change shader to show bright pink on index out of bounds and add assertions to help prevent this sort of bug in the future.
2011-11-18SH-2699 Potential fix for occlusion culling being overly aggressive on 9800 GTDave Parks
2011-11-18mergeBrad Payne (Vir Linden)
2011-11-18Re-added some missing calls to apr_pool_destroy() that I failed to readd ↵Logan Dethrow
after the thread local storage rollback. Also added a call to LLProxy::cleanupClass() to prevent indra/test from segfaulting on exit.
2011-11-18merge changes for vmrg-186Oz Linden
2011-11-18MergeLogan Dethrow
2011-11-17LLSD-14: fixed way-too-overloaded local variable.Nat Goodspeed
2011-11-17LLSD-14: Make dumpStats()/calcStats() implementation more robustNat Goodspeed
per Monty code review
2011-11-17EXP-1559 FOLLOWUP Changed the success message for profile feed.Vadim ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-16 15:09:38 +0000