summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-08merge back beta tagsOz Linden
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-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-06merge changes for storm-1588Oz Linden
2011-09-06merge changes for vwr-26823Oz Linden
2011-09-02Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-09-02merge changes for .v-pbOz Linden
2011-09-02merge back beta tagsOz Linden
2011-09-02merge changes for storm-1027Oz Linden
2011-09-02correct DOS line endingsOz Linden
2011-09-02re-write the hash table code to eliminate potential flaws and simplify the ↵Xiaohong Bao
implementation.
2011-09-02merged .hgtagsDebi King (Dessie)
2011-09-02Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aaDebi King (Dessie)
2011-09-02increment viewer version to 3.0.5Oz Linden
2011-09-02Added tag 3.0.4-start for changeset 586907287be5Oz Linden
2011-09-02VWR-26823 FIXED Removed DigiNotar CA certificate.Vadim ProductEngine
2011-09-01Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aaDebi King (Dessie)
2011-08-31EXP-1149 FIX Log in Screen: Replace the new mode selector with the old oneRichard Nelson
improved graphics and layout for logged in mode selector
2011-08-31Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-08-31Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-08-31turn on private memory pool by default.Xiaohong Bao
2011-08-31MergeXiaohong Bao
2011-08-31Point to new Mac version of LLQtWebKit to fix symbol export issue on that ↵callum
platform
2011-08-31storm-1578: change default Away timeout to "never"Oz Linden
2011-08-31update list of translatorsOz Linden
2011-08-31merge changes for storm-1567Oz Linden
2011-08-31merge changes for storm-638Oz Linden
2011-08-31merge changes for storm-1566Oz Linden
2011-08-31merge changes for storm-1572Oz Linden
2011-08-31merge changes for storm-1574Oz Linden
2011-08-31merge changes for storm-1522Oz Linden
2011-08-31merge back beta tag changesOz Linden
2011-08-31add missing contribution recordOz Linden
2011-08-30 EXP-1079 FIX "User is not logged out immediately inworld when selecting to ↵Richard Linden
change modes and restart while logged in"
2011-08-29Silly URL typocallum
2011-08-29Merge with head.callum
2011-08-29EXP-1122 FIX (Viewer) LLQtWebKit should support a JavaScript/content ↵callum
debugger to help content creators Viewer side changes to enable Web debugger.
2011-08-29Fix Linux build - doesn't like missing enums in case statement.callum
2011-08-29STORM-1522 Region/Estate -> Terrain Text explaining Low and High values is ↵Jonathan Yap
truncated
2011-08-29merged .hgtagsDebi King (Dessie)
2011-08-29Added tag DRTVWR-86_3.0.2-beta2, 3.0.2-beta2 for changeset e5c9af2d7980Debi King (Dessie)
2011-08-29increment viewer version to 3.0.4Oz Linden
2011-08-29Added tag 3.0.3-start for changeset b95ddac176acOz Linden
2011-08-29merge changes for .v-pbOz Linden
2011-08-29merge tags back from viewer-betaOz Linden
2011-08-29merge tags from viewer-releaseOz Linden
2011-08-28merged fix for EXP-1160 (STORM-1575)Debi King (Dessie)
2011-08-28Added tag DRTVWR-83_3.0.2-beta1, 3.0.2-beta1 for changeset 42784bf50fa0Debi King (Dessie)