daf0b047fa
merge changes for storm-1595
2011-09-15 15:27:42 -04:00
d3c05d52e5
merge changes for storm-1585
2011-09-15 15:27:13 -04:00
3981afe7fd
pulled back release tags
2011-09-15 15:26:43 -04:00
11dce3b74d
reconciled .hgtags
2011-09-15 14:32:55 -04:00
671a76b40c
Added tag DRTVWR-89_3.0.3-beta2, 3.0.3-beta2 for changeset 61aa7974df08
2011-09-15 14:30:19 -04:00
caa65cefe2
merge
2011-09-15 13:30:15 -04:00
b2d20f5a98
merge changes for storm-1532
2011-09-14 08:33:25 -04:00
961c4d3816
merge changes for 3.0.3 beta 2 fixes
2011-09-13 14:47:34 -04:00
a21aa5509d
STORM-1595 FIXED Removing a wrong debug assertion.
2011-09-13 16:59:30 +03:00
8ed52654d0
STORM-1585 FIXED Duplicated/missing XUI IDs in floater_preferences_proxy.xml.
2011-09-13 03:47:27 +03:00
c04412f726
sh-2379: re-enable multi-threaded curl (fixes viewer stall, may re-introduce some crashes)
2011-09-12 17:22:36 -04:00
e26bd6c140
merge changes for storm-1593 (marketplace inbox)
2011-09-12 14:52:18 -04:00
1c57963673
Removed windows line endings to conform to coding policy.
2011-09-12 11:30:24 -07:00
08b7594999
merge changes for storm-1587
2011-09-12 11:32:13 -04:00
84a53eb547
merge changes for storm-1297
2011-09-12 11:31:40 -04:00
1d726db718
merge changes for storm-1028
2011-09-12 11:30:47 -04:00
9779fcd97a
merge changes for storm-918
2011-09-12 11:29:59 -04:00
9df77524fc
only include the h file when it is being created, and make the #endif in the h file safer for picky compilers
2011-09-12 07:21:22 -04:00
49d0e291d8
add templates for use with hg-tools/create.py
2011-09-11 10:01:38 -04:00
31e43f700b
Update types from time_t to F64 to fix type conversion error related to timestamps.
2011-09-09 09:58:47 -07:00
18af6e397e
merge changes for storm-1590
2011-09-09 12:43:07 -04:00
8d64e5d831
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
2011-09-08 22:37:14 -07:00
72913ddf49
EXP-1196 FIX Fix param block template ordering
2011-09-08 22:35:53 -07:00
f2acd554bc
Clean up erroneous XUI parsing errors.
2011-09-08 16:34:54 -07:00
0a4bce2b79
Merge
2011-09-08 15:14:08 -07:00
24db50a37f
fix for held down delay not parsing from xui
2011-09-08 15:07:11 -07:00
15fceb47a9
Backed out changeset: b5b389170dcd
2011-09-08 13:20:15 -07:00
8b1ce96eae
merge
2011-09-08 12:32:07 -07:00
719a8409d0
Fix up "view" popup layout to separate overlapping items
2011-09-08 12:30:47 -07:00
4ad3676985
Disable merchant outbox context menu
2011-09-08 12:09:43 -07:00
ea18429a2c
EXP-1194 FIX -- Update New tag behavior to update Newness timestamp when 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-08 11:45:12 -07:00
1c7b1532e9
Merge from viewer-experience
2011-09-08 10:55:48 -07:00
e458c95f36
Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-beta
2011-09-08 11:39:54 -04:00
5a03453b2c
Corrected license information in llsingleton_test.cpp.
2011-09-08 11:03:21 -04:00
89b9800579
merge back beta tags
2011-09-08 11:02:28 -04:00
7d381c6596
LLProxy: Moved the enabling of the UDP proxy back into startSOCKSProxy()
2011-09-08 10:43:07 -04:00
3d295fbf27
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-07 18:14:40 -04:00
286342f705
STORM-1541: Change llassert() to llassert_always(): unit tests expect.
...
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-07 18:03:25 -04:00
b4a1d339fc
STORM-1541: Add LLInstanceTracker tests for active-iterator asserts.
...
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-07 17:29:08 -04:00
78821c51a1
Merge from viewer-experience
2011-09-07 13:58:19 -07:00
b8fddce34d
Merge. Fixed issue with LLProxy code related to changes to the LLSocket interface.
2011-09-07 16:40:40 -04:00
c64bd7d5cb
Reduced text spam on exit by not trying to set all objects to a NULL region.
...
Reviewed by Richard.
2011-09-07 12:46:37 -07:00
6bb2b2cb99
EXP-1194 FIX -- Update New tag behavior to update Newness timestamp when 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-07 12:45:50 -07:00
535710ae25
STORM-1587 FIXED Alert notifications were shown in English, no matter what viewer language was.
2011-09-07 22:13:05 +03:00
8c6f752982
STORM-1541: Hoist LLInstanceTracker::getMap_() to base getStatic().
...
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-06 22:07:49 -04:00
fef401a176
build fix
2011-09-06 16:05:03 -07:00
12832768e1
EXP-1196 FIX Fix param block template ordering
...
forgot to set menu name in menu.xml
reviewed by Leslie
2011-09-06 14:45:37 -07:00
b183b6f141
EXP-1196 FIX Fix param block template ordering
...
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-06 14:45:11 -07:00
f73b795bb7
Renamed LLCurl::check_curl_code() and LLCurl::check_curl_multi_code() to prevent ambiguous name build error.
2011-09-06 17:33:18 -04:00
82b1b1bc6e
merge changes for storm-1588
2011-09-06 17:00:55 -04:00
Oz Linden