summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-15merge changes for storm-1595Oz Linden
2011-09-15merge changes for storm-1585Oz Linden
2011-09-15pulled back release tagsOz Linden
2011-09-15reconciled .hgtagsDebi King (Dessie)
2011-09-15Added tag DRTVWR-89_3.0.3-beta2, 3.0.3-beta2 for changeset 61aa7974df08Debi King (Dessie)
2011-09-15mergeDebi King (Dessie)
2011-09-14merge changes for storm-1532Oz Linden
2011-09-13merge changes for 3.0.3 beta 2 fixesOz Linden
2011-09-13STORM-1595 FIXED Removing a wrong debug assertion.Vadim ProductEngine
2011-09-13STORM-1585 FIXED Duplicated/missing XUI IDs in floater_preferences_proxy.xml.Vadim ProductEngine
2011-09-12sh-2379: re-enable multi-threaded curl (fixes viewer stall, may re-introduce ↵Oz Linden
some crashes)
2011-09-12merge changes for storm-1593 (marketplace inbox)Oz Linden
2011-09-12Removed windows line endings to conform to coding policy.Leslie Linden
2011-09-12merge changes for storm-1587Oz Linden
2011-09-12merge changes for storm-1297Oz Linden
2011-09-12merge changes for storm-1028Oz Linden
2011-09-12merge changes for storm-918Oz Linden
2011-09-12only include the h file when it is being created, and make the #endif in the ↵Oz Linden
h file safer for picky compilers
2011-09-11add templates for use with hg-tools/create.pyOz Linden
2011-09-09Update types from time_t to F64 to fix type conversion error related to ↵Leslie Linden
timestamps.
2011-09-09merge changes for storm-1590Oz Linden
2011-09-08Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-mergeRichard Linden
2011-09-08EXP-1196 FIX Fix param block template orderingRichard Linden
2011-09-08Clean up erroneous XUI parsing errors.Leslie Linden
2011-09-08MergeLeslie Linden
2011-09-08fix for held down delay not parsing from xuiRichard Linden
2011-09-08Backed out changeset: b5b389170dcdRichard Linden
2011-09-08mergeLeslie Linden
2011-09-08Fix up "view" popup layout to separate overlapping itemsLeslie Linden
2011-09-08Disable merchant outbox context menuLeslie Linden
2011-09-08EXP-1194 FIX -- Update New tag behavior to update Newness timestamp when ↵Leslie Linden
Received Items panel is open and do not auto open Received Items panel The freshness calculation now takes into account the timezone difference between LLDate's return value of GMT and the inventory server's GMT-7 times.
2011-09-08Merge from viewer-experienceLeslie Linden
2011-09-08Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-betaDebi King (Dessie)
2011-09-08Corrected license information in llsingleton_test.cpp.Logan Dethrow
2011-09-08merge back beta tagsOz Linden
2011-09-08LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()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-07Reduced text spam on exit by not trying to set all objects to a NULL region.Leslie Linden
Reviewed by Richard.
2011-09-07EXP-1194 FIX -- Update New tag behavior to update Newness timestamp when ↵Leslie Linden
Received Items panel is open and do not auto open Received Items panel * Updated inbox freshness time setting name to "LastInventoryInboxActivity" * New time stamp reflects time of last activity performed on the inbox by the user * Selection and opening items in the inbox both count as activity on the inbox * Focus going to the inbox panel counts as activity on the inbox * Creation date of folders now computed based on date of items being added to them * Creation date of folders no longer relies on queries for creation date, as is done during sorting * Folders are assumed to be "new" if no inbox freshness time setting is saved
2011-09-07STORM-1587 FIXED Alert notifications were shown in English, no matter what ↵Vadim ProductEngine
viewer language was.
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-06build fixRichard Linden
2011-09-06EXP-1196 FIX Fix param block template orderingRichard Linden
forgot to set menu name in menu.xml reviewed by Leslie
2011-09-06EXP-1196 FIX Fix param block template orderingRichard Linden
changed ordering of template loading relative to constructor setting of params moved a lot of constructor-set params to template files reviewed by Leslie
2011-09-06Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to ↵Logan Dethrow
prevent ambiguous name build error.
2011-09-06merge changes for storm-1588Oz Linden