summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-09-09Removed some spurious newlines that I introduced into CMakeLists.txt.Logan Dethrow
2011-09-09Backed out stone's llsocket changes. revision cc837860d0a1.Logan Dethrow
The final version should be picked up when update.
2011-09-09Fixed indra test dynamic library issues.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-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 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-02VWR-26823 FIXED Removed DigiNotar CA certificate.Vadim ProductEngine
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-31storm-1578: change default Away timeout to "never"Oz 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-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-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-29increment viewer version to 3.0.4Oz Linden
2011-08-29merge changes for .v-pbOz Linden
2011-08-27STORM-638 FOLLOWUP Fixed a silly pointer usage mistake.Vadim ProductEngine
2011-08-26EXP-1149 FIX Log in Screen: Replace the new mode selector with the old oneRichard Nelson
2011-08-26EXP-1111 FIX LLQtWebKit (and related media system) should log events, ↵callum
progress etc. to make debugging problems easier
2011-08-26EXP-1162 FIX We are failing to create the Outfit links from the library ↵Richard Nelson
initial outfits copied on first login reviewed by Stone
2011-08-26disabled basic inventory root creationRichard Nelson
reviewed by Stone
2011-08-26EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a ↵Richard Nelson
prim in latest Mesh build 239475 brought back some old logic for dispatching to child folder as drag and drop fallback
2011-08-26STORM-1574 Binary data in panel_login.xml -- filled up-pointing triangle.Jonathan Yap
2011-08-26STORM-1567 Mute button for llDialog popupJonathan Yap
Added comment where sidebar block list is opened.
2011-08-26STORM-1567 Mute button for llDialog popupJonathan Yap
Made changes per RB feedback.
2011-08-26STORM-638 FIXED "Object Return" didn't return distant objects if the ↵Vadim ProductEngine
confirmation dialog wasn't suppressed. Reason: Showing the confirmation dialog resets object selection, thus there is nothing to derez. Fix: Save selection until user answers in the confirmation dialog. I didn't investigate why the bug occurred only for distant object (must be some internal LLSelectMgr magic).
2011-08-26merge changes for storm-1568Oz Linden
2011-08-26merge changes for storm-1543Oz Linden
2011-08-25MErge with tipcallum
2011-08-26STORM-1543 WIP Removed invalid IOR_BUSY response option.Vadim ProductEngine
Addressing review feedback.
2011-08-25merge changes for storm-1268Oz Linden
2011-08-25merge changes for storm-1542Oz Linden
2011-08-25merge changes for storm-1276Oz Linden
2011-08-25merge changes for storm-1571Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-25 08:23:54 +0000