summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2011-12-13storm-1729: ensure that cpu id has no leading or trailing spaces for ease of ↵Oz Linden
comparison and formatting
2011-12-12increment viewer version to 3.2.6Oz Linden
2011-12-12merge changes for vmrg-204Oz Linden
2011-12-09Backed out changeset fafd857891b1Dave Parks
2011-12-08Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
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-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-05fix for sh-2738: Texture fetching freezes due to LLcurlXiaohong Bao
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-30Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-11-30mergeBrad Payne (Vir Linden)
2011-11-30increment viewer version to 3.2.5Oz Linden
2011-11-28bumped up MSVC warning level to 3 to catch more stuff that gcc catchesRichard Linden
2011-11-28Automated merge with ↵Xiaohong Bao
https://bitbucket.org/VirLinden/viewer-development-shining-fixes
2011-11-22trivial: update the memory pool log info to the latest.Xiaohong Bao
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-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-17LLSD-14: while we're in llsd.h anyway, fix longstanding misspellings.Nat Goodspeed
My tollerance is at an end. :-P
2011-11-17LLSD-14: Fix silly syntax error in subscript bounds check.Nat Goodspeed
2011-11-17LLSD-14: Bring over llsd.{h,cpp} enhancements from server-trunk.Nat Goodspeed
Because new enum values have been added to the LLSD type field, a few external switch statements must be adjusted to suppress fatal warnings, even though we never expect to encounter an LLSD instance containing any of the new values.
2011-11-14increment viewer version to 3.2.4Oz Linden
2011-11-08increment viewer version to 3.2.3Oz Linden
2011-11-03mergeBrad Payne (Vir Linden)
2011-10-31increment viewer version to 3.2.1Oz Linden
2011-10-31mergeBrad Payne (Vir Linden)
2011-10-25fix for SH-2624: crash at LLPrivateMemoryPoolManager::freeMem: ASSERT (!addr)Xiaohong Bao
2011-10-24Backed out changeset 9bcc2b717663 (restore version number to 3.2.1)Oz Linden
2011-10-22correct version number for 3.2.0 beta 2Oz Linden
2011-10-21merge with viewer-devRichard@Callum-HP-PC.lindenlab.com
2011-10-18increment viewer version to 3.2.1Oz Linden
2011-10-18increment viewer version to 3.2.0Oz Linden
2011-10-18merge changes for STORM-1654Oz Linden
2011-10-17fixed one crash on exitRichard Nelson
2011-10-17merge changes for storm-1651Oz Linden
2011-10-17merge back late changes and tags from release branchOz Linden
2011-10-15Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-10-14b782a75c99e6 backout cleanupDave Parks
2011-10-14Merge backout of b782a75c99e6Dave Parks
2011-10-14Backed out changeset b782a75c99e6Dave Parks
2011-10-13SH-2559 Remove fast timer (could be responsible for some crashes).Dave Parks
2011-10-11pull back beta fix for sh-2434Oz Linden
2011-10-11merge changes for vwr-26864Oz Linden
2011-10-11merge changes for STORM-1641Oz Linden
2011-10-10fix for SH-2464: Crash on exit in LLPrivateMemoryPoolManager::freeMemXiaohong Bao
2011-10-05merge changes for storm-1637Oz Linden
2011-10-05fix for SH-2434: Mac viewer sometimes freezes at start up and must be force ↵Xiaohong Bao
quit.
2011-10-05merge with viewer-developmentRichard Nelson
2011-10-05Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed