fb938a092c
FIRE-3834: Always disable LLs memory pool for now.
2011-11-11 21:36:59 +01:00
2d929bd1a9
FIRE-3760; allow to set MemoryPrivatePoolEnabled to FALSE again.
2011-10-31 19:10:26 +01:00
e19e95e55f
FIRE-3459: Support for multi-grid hop:// protocol, by ArminW
2011-10-28 18:09:14 -04:00
ea5ea803db
Fix casts that are invalid for 64 bit compilations.
2011-10-28 23:43:41 +02:00
b1b093a5e2
Re-enable 10977128ae0a, optimize string comparisons away.
2011-10-28 21:08:35 +02:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
9785506d56
merge changes for storm-1651
2011-10-17 16:27:18 -04:00
77dc594e79
merge back late changes and tags from release branch
2011-10-17 16:19:57 -04:00
4924f0c99b
b782a75c99e6 backout cleanup
2011-10-14 12:38:48 -05:00
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
fc2929bf4f
SH-2559 Remove fast timer (could be responsible for some crashes).
2011-10-13 17:06:33 -05:00
aabdbeadf5
pull back beta fix for sh-2434
2011-10-11 13:55:20 -04:00
852349218e
merge changes for vwr-26864
2011-10-11 10:58:02 -04:00
baf802e25b
merge changes for STORM-1641
2011-10-11 10:31:39 -04:00
897972636d
fix for SH-2464: Crash on exit in LLPrivateMemoryPoolManager::freeMem
2011-10-10 16:31:56 -06:00
5f38ec7f92
merge changes for storm-1637
2011-10-05 18:02:58 -04:00
5ef05e151d
fix for SH-2434: Mac viewer sometimes freezes at start up and must be force quit.
2011-10-05 15:21:10 -06:00
30480b58db
Automated merge with http://hg.secondlife.com/viewer-development
2011-10-05 11:25:19 -04:00
194bedbb96
merge changes for vwr-26864
2011-10-05 09:03:24 -04:00
d0e36ade5b
increment viewer version to 3.1.1
2011-10-04 06:53:34 -04:00
4e228b7d66
increment viewer version to 3.1.0
2011-10-04 06:52:55 -04:00
ad9c28a269
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-26 15:44:21 -04:00
627bd3c5b9
merge changes for storm-1607
2011-09-22 08:52:21 -04:00
f8442cef72
increment viewer version to 3.0.6
2011-09-21 15:31:39 -04:00
1911586ce4
storm-1610
2011-09-19 16:58:21 -04:00
ac918730be
merge
2011-09-16 09:13:38 -04:00
92fa144dce
merge
2011-09-15 16:09:17 -04:00
556cd3a53b
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-14 19:47:37 -07:00
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
8b7c07651c
improved fast timers display
...
can move and resize
better visualization of timer history
can click drag to browse history
increased frame history to 300
2011-09-14 10:50:32 -07:00
0a0ae2dd3f
STORM-1562 Potential fix for crash in LLCurl::run -- don't run curl_multi_perform from multiple threads simultaneously.
2011-09-13 12:45:28 -05:00
b2853c1a74
merge
2011-09-13 12:11:11 -04:00
e26bd6c140
merge changes for storm-1593 (marketplace inbox)
2011-09-12 14:52:18 -04:00
18af6e397e
merge changes for storm-1590
2011-09-09 12:43:07 -04:00
1c7b1532e9
Merge from viewer-experience
2011-09-08 10:55:48 -07:00
5a03453b2c
Corrected license information in llsingleton_test.cpp.
2011-09-08 11:03:21 -04:00
2d19a20025
add getInfo to LLView to get state information about ui elements.
2011-09-08 09:46:04 -05:00
616a7b549d
fix for VWR-26864: Recent commit to Snowstorm project introduces frequent errors and crashes associated with private memory pool.
2011-09-07 23:23:08 -06: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
de2b7cd28c
Automated merge with ssh://hg.lindenlab.com/nat/viewer-storm-1541
2011-09-07 15:36:45 -04: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
a8d49f7cf5
LLProxy code review fixes.
...
* Removed check_curl_code and check_curl_multi_code from the global namespace.
* Added comments documenting which thread the public methods of LLProxy should be called from.
* Corrected grammar in LLSingleton.h
* Fixed a buffer scope problem in llpacketring.cpp.
2011-09-06 16:54:53 -04:00
b59c0a6680
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-06 13:58:47 -04:00
ecba41419f
CHOP-763: Nested LLEventAPI::Response class needs LL_COMMON_API too.
...
Apparently the outer class's LL_COMMON_API marker affects all outer class
members, but not nested classes. Making it explicit fixes Windows link errors.
2011-09-06 13:25:27 -04:00
08c0de785f
merge
2011-09-06 09:42:11 -04:00
Nicky