summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-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-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-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-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
2011-08-25merge changes for storm-1570Oz Linden
2011-08-24STORM-1572 XML issues for Basic/Advanced Mode button in menu barJonathan Yap
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-23Respect --no-verify-ssl-cert option.Aaron Stone
2011-08-23mergeLogan Dethrow
2011-08-23Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings ↵Logan Dethrow
Floater.
2011-08-23STORM-1567 Mute button for llDialog popupJonathan Yap
Updating patch to current version of viewer-development
2011-08-22Fixed a xui widget name mismatch between c++ and xml.Logan Dethrow
2011-08-22STORM-1566 FIXED Sidebar tabs didn't detach by drag-n-drop.Vadim ProductEngine
The regression was introduced in the fix of EXP-856 (changeset 9e650f2750b5).
2011-08-22increment viewer version to 3.0.3Oz Linden
2011-08-22STORM-1542 FIXED Changed search URL back from search-beta to search.sl.com.Vadim ProductEngine
2011-08-22STORM-1543 WIP More cleanup and comments.Vadim ProductEngine
2011-08-22merge changes for storm-1554Oz Linden
2011-08-20MergeDave Parks
2011-08-20merge changes for storm-1562Oz Linden
2011-08-20merge changes for storm-1041Oz Linden
2011-08-20merge changes for storm-793Oz Linden
2011-08-20merge changes for storm-782Oz Linden