summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
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
2011-10-05merge changes for vwr-26864Oz Linden
2011-10-04increment viewer version to 3.1.1Oz Linden
2011-10-04increment viewer version to 3.1.0Oz Linden
2011-10-03EXP-1286 : First pass at Drag and Drop of tools. Not functional. Most hooks ↵Merov Linden
into the LLToolDragAndDrop system in to support the new AT_WIDGET and SOURCE_VIEWER
2011-09-26Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
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-08add getInfo to LLView to get state information about ui elements.Andrew A. de Laix
2011-09-07fix for VWR-26864: Recent commit to Snowstorm project introduces frequent ↵Xiaohong Bao
errors and crashes associated with private memory pool.
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-07Automated merge with ssh://hg.lindenlab.com/nat/viewer-storm-1541Nat Goodspeed
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-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed