summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2012-01-30Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.Todd Stinson
2012-01-30increment viewer version to 3.2.9Oz Linden
2012-01-24WIP: path-118prep
2012-01-24mergeBrad Payne (Vir Linden)
2012-01-20fix for SH-2823 and SH-2824: LLCurl crash inside LLBufferArray::countAfter() ↵Xiaohong Bao
and LLBufferArray::copyIntoBuffers
2012-01-17increment viewer version to 3.2.8Oz Linden
2012-01-17merge changes for vmrg-216Oz Linden
2012-01-13merge changes for vmrg-215Oz Linden
2012-01-12Automated merge with https://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-01-12Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/Richard Linden
2012-01-10EXP-1525 FIXED Potential fix for a crash at shutdown: added some error ↵Vadim ProductEngine
handling to saving inventory cache.
2012-01-09increment viewer version to 3.2.7Oz Linden
2012-01-09Backed out changeset 4fd359f2f1c3Oz Linden
2012-01-09increment viewer version to 3.2.7Oz Linden
2012-01-06Looking for better fix to EXP-1693 - date localizationRichard Linden
Backed out changeset: 4f3024e9d629
2012-01-05Automated merge with https://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-01-04mergeBrad Payne (Vir Linden)
2011-12-23STORM-1790 Provide a Develop sub-menu to change the default logging levelJonathan Yap
co-authored with Zi Ree
2011-12-21merge changes for vmrg-209 and vmrg-210 back from beta branchOz Linden
2011-12-21EXP-1693 FIXED the date localization in Item Profile window, Voice Morphs ↵Seth ProductEngine
window and in scroll list widget in general. - Added a customizable date format string to be used for scroll list cell of "date" type. - The date localization does not change the value of a scroll list cell changing only its string representation. - Added using localized week days and month names from strings.xml for all locales not only Ja and Pl as it was before. - Changed the date format in Item Profile window (French locale) as noted in the issue description. - For this fix the French locale still needs the localization of the following strings in strings.xml: <string name="dateTimeWeekdaysNames"> <string name="dateTimeWeekdaysShortNames"> <string name="dateTimeMonthNames"> <string name="dateTimeMonthShortNames"> <string name="dateTimeDayFormat"> <string name="dateTimeAM"> <string name="dateTimePM">
2011-12-15fix for SH-2738 and SH-2777, might also help SH-2723: heap corruptionXiaohong Bao
SH-2738: Texture fetching freezes due to LLcurl SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15fix for SH-2738 and SH-2777, might also help SH-2723: heap corruptionXiaohong Bao
SH-2738: Texture fetching freezes due to LLcurl SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-13storm-1729: ensure that cpu id has no leading or trailing spaces for ease of ↵Oz Linden
comparison and formatting
2011-12-12mergeBrad Payne (Vir Linden)
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-07mergeBrad Payne (Vir Linden)
2011-12-07mergeBrad Payne (Vir 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-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-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