summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2011-09-22merge changes for storm-1607Oz Linden
2011-09-21increment viewer version to 3.0.6Oz Linden
2011-09-19storm-1610Oz Linden
2011-09-16mergeBrad Payne (Vir Linden)
2011-09-15mergeBrad Payne (Vir Linden)
2011-09-14Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-09-14mergeBrad Payne (Vir Linden)
2011-09-14improved fast timers displayRichard Nelson
can move and resize better visualization of timer history can click drag to browse history increased frame history to 300
2011-09-13STORM-1562 Potential fix for crash in LLCurl::run -- don't run ↵Dave Parks
curl_multi_perform from multiple threads simultaneously.
2011-09-13mergeBrad Payne (Vir Linden)
2011-09-12merge changes for storm-1593 (marketplace inbox)Oz Linden
2011-09-09merge changes for storm-1590Oz Linden
2011-09-08Merge from viewer-experienceLeslie Linden
2011-09-08Corrected license information in llsingleton_test.cpp.Logan Dethrow
2011-09-07Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2011-09-07STORM-1541: Change llassert() to llassert_always(): unit tests expect.Nat Goodspeed
Now that we have unit tests that require assertion failure if you try to delete an LLInstanceTracker subclass instance with an iterator loose, having llassert() "sometimes" compile away (whimsically, depending on platform as well as build type!) makes those tests fail. Use llassert_always() instead.
2011-09-07STORM-1541: Add LLInstanceTracker tests for active-iterator asserts.Nat Goodspeed
The recent class-static LLInstanceTracker::instance_iter and key_iter reference count is intended to guard against deleting an instance of an LLInstanceTracker subclass during iteration. Add tests for that functionality.
2011-09-07Merge from viewer-experienceLeslie Linden
2011-09-07Merge. Fixed issue with LLProxy code related to changes to the LLSocket ↵Logan Dethrow
interface.
2011-09-06STORM-1541: Hoist LLInstanceTracker::getMap_() to base getStatic().Nat Goodspeed
Generalize the notion of getting some chunk of "static" storage: introduce LLInstanceTrackerBase::getStatic() template method. Define StaticData struct containing the InstanceMap (or InstanceSet, for that specialization) along with the S32 that caused the VS2010 linker so much grief. Completely eliminate that S32 as an actual class-static member, qualifying all references with the struct returned by getStatic(). In LLInstanceTrackerBase::getInstances(), use one std::map lookup instead of three.
2011-09-06LLProxy code review fixes.Logan Dethrow
* Removed check_curl_code and check_curl_multi_code from the global namespace. * Added comments documenting which thread the public methods of LLProxy should be called from. * Corrected grammar in LLSingleton.h * Fixed a buffer scope problem in llpacketring.cpp.
2011-09-06mergeBrad Payne (Vir Linden)
2011-09-02Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-09-02merge changes for storm-1027Oz Linden
2011-09-02re-write the hash table code to eliminate potential flaws and simplify the ↵Xiaohong Bao
implementation.
2011-09-02increment viewer version to 3.0.5Oz Linden
2011-09-01MergeLogan Dethrow
2011-09-01Clarified the reason for adding the deleteSingleton method to LLSingleton. ↵Logan Dethrow
Added a simple unit test to verify the functionality of the deleteSingleton method.
2011-08-31Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-08-31MergeXiaohong Bao
2011-08-30mergeBrad Payne (Vir Linden)
2011-08-29mergBrad Payne (Vir Linden)
2011-08-29increment viewer version to 3.0.4Oz Linden
2011-08-25merge changes for storm-1571Oz Linden
2011-08-24mergeBrad Payne (Vir Linden)
2011-08-24Re-add 3 llinstancetracker tests disabled by changeset 1ead63777bf6.Nat Goodspeed
Fix LLInstanceTracker::key_iter constructor param; accepting InstanceMap::iterator by non-const reference relied on Microsoft extension that accepts non-const reference to an rvalue. Given typical iterator implementation, simply accept by value instead, which makes gcc happy too.
2011-08-23mergeLogan Dethrow
2011-08-22Merge from viewer-experienceLeslie Linden
2011-08-22mergeBrad Payne (Vir Linden)
2011-08-22increment viewer version to 3.0.3Oz Linden
2011-08-19better unit test for nested brackets in string replacementRichard Linden
2011-08-19fix for not properly handling nested brackets inRichard Linden
string replacement, e.g. [[FOO]]
2011-08-19MergeLeslie Linden
2011-08-18Merge.Logan Dethrow
2011-08-18mergeBrad Payne (Vir Linden)
2011-08-18mergeRichard Nelson
2011-08-18Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-08-18EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimingsRichard Nelson
2011-08-17Merge from viewer-experienceLeslie Linden
2011-08-17EXP-700 FIX SLPlugin(s) takes high CPU%callum
Reviewed by Richard.