summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-12merge changes for storm-1593 (marketplace inbox)Oz Linden
2011-09-12BUILDFIX GCC fixing unused variableNyx (Neal Orman)
2011-09-12Removed windows line endings to conform to coding policy.Leslie Linden
2011-09-12STORM-1579 xml formatting issues in Region/Estate floaterJonathan Yap
Add entry to contributions.txt
2011-09-12STORM-1579 xml formatting issues in Region/Estate floaterJonathan Yap
Enlarged Covenant display area. Widened Restart Region and Delay Restart to be the same size as the two buttons above them.
2011-09-12make script executableOz 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-08mergeprep
2011-09-08Fix for SH-2210prep
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 https://bitbucket.org/paul_productengine/sh-2309Seth ProductEngine
2011-09-08SH-2309 FIXED 'Triangles limit' combo value updating problem.Seth ProductEngine
Fixed updating 'Error threshold' spinner control visibility.
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-08add getInfo to LLView to get state information about ui elements.Andrew A. de Laix
2011-09-08LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()Logan Dethrow
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-07sync with viewer-developmenteli
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-07Automated merge with ssh://hg.lindenlab.com/nat/viewer-ui-injectionAndrew A. de Laix
2011-09-07Automated merge with ssh://hg.lindenlab.com/nat/viewer-ui-injectionAndrew A. de Laix
2011-09-07Automated merge with ssh://hg.lindenlab.com/nat/viewer-storm-1541Nat Goodspeed
2011-09-07add getInfo command to get state information about a ui elementAndrew A. de Laix
2011-09-07STORM-1587 FIXED Alert notifications were shown in English, no matter what ↵Vadim ProductEngine
viewer language was.
2011-09-07SH-2371 FIXED "Not allowed to upload message" flashes when uploader dialog ↵Paul ProductEngine
comes up - This is a regression bug caused by changeset:20407
2011-09-07Merge mesh-development with sh-2309Paul ProductEngine