8a952e42e9
Removed some spurious newlines that I introduced into CMakeLists.txt.
2011-09-09 14:20:19 -04:00
c47b398b75
Backed out stone's llsocket changes. revision cc837860d0a1.
...
The final version should be picked up when update.
2011-09-09 11:58:35 -04:00
2291d5a9be
Fixed indra test dynamic library issues.
2011-09-09 11:56:47 -04:00
89b9800579
merge back beta tags
2011-09-08 11:02:28 -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
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
82b1b1bc6e
merge changes for storm-1588
2011-09-06 17:00:55 -04:00
e2dea0b494
merge changes for vwr-26823
2011-09-06 17:00:23 -04:00
fc45e9cbf6
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-02 20:24:06 -07:00
f6a8fbe19f
merge changes for .v-pb
2011-09-02 16:03:20 -04:00
a2a73feed0
merge back beta tags
2011-09-02 16:03:09 -04:00
0ab6eee099
merge changes for storm-1027
2011-09-02 13:48:29 -04:00
8efd992d50
correct DOS line endings
2011-09-02 13:48:01 -04:00
ba2ae6bc95
re-write the hash table code to eliminate potential flaws and simplify the implementation.
2011-09-02 11:17:03 -06:00
1f149a432b
merged .hgtags
2011-09-02 10:23:46 -04:00
deddcfb8c5
Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aa
2011-09-02 10:13:04 -04:00
fcc51bd5b0
increment viewer version to 3.0.5
2011-09-02 09:46:48 -04:00
21ad5e0a0e
Added tag 3.0.4-start for changeset 586907287be5
2011-09-02 09:46:16 -04:00
512c057c2d
VWR-26823 FIXED Removed DigiNotar CA certificate.
2011-09-02 15:43:25 +03:00
15ec41f95f
Added tag DRTVWR-85_3.0.3-beta1, 3.0.3-beta1 for changeset 6694f3f062aa
2011-09-01 14:34:25 -04:00
1836dd12c9
EXP-1149 FIX Log in Screen: Replace the new mode selector with the old one
...
improved graphics and layout for logged in mode selector
2011-08-31 17:02:55 -07:00
2154bccdc4
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-31 11:51:38 -07:00
1379188c82
Automated merge with http://hg.secondlife.com/viewer-development
2011-08-31 11:15:02 -06:00
e547c36e25
turn on private memory pool by default.
2011-08-31 11:14:25 -06:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
09394d3a9d
Point to new Mac version of LLQtWebKit to fix symbol export issue on that platform
2011-08-31 09:27:13 -07:00
879c4ad64b
storm-1578: change default Away timeout to "never"
2011-08-31 10:36:16 -04:00
ba6f7883ab
update list of translators
2011-08-31 10:35:49 -04:00
e62a4d4ec1
merge changes for storm-1567
2011-08-31 09:07:32 -04:00
cff59a6e5f
merge changes for storm-638
2011-08-31 09:06:50 -04:00
af3f8f98f6
merge changes for storm-1566
2011-08-31 09:06:19 -04:00
ee4fc00a27
merge changes for storm-1572
2011-08-31 09:05:49 -04:00
3416cf0da8
merge changes for storm-1574
2011-08-31 09:05:06 -04:00
a2c5944666
merge changes for storm-1522
2011-08-31 09:03:13 -04:00
7f06179392
merge back beta tag changes
2011-08-31 09:00:05 -04:00
f6505dc261
add missing contribution record
2011-08-31 08:59:20 -04:00
e2d8a2ca60
EXP-1079 FIX "User is not logged out immediately inworld when selecting to change modes and restart while logged in"
2011-08-30 13:40:20 -07:00
64b000a822
Silly URL typo
2011-08-29 17:55:09 -07:00
ce921ad101
Merge with head.
2011-08-29 17:19:20 -07:00
d341c400fc
EXP-1122 FIX (Viewer) LLQtWebKit should support a JavaScript/content debugger to help content creators
...
Viewer side changes to enable Web debugger.
2011-08-29 17:13:29 -07:00
b31a29303a
Fix Linux build - doesn't like missing enums in case statement.
2011-08-29 15:35:10 -07:00
36f9b513b0
STORM-1522 Region/Estate -> Terrain Text explaining Low and High values is truncated
2011-08-29 17:36:37 -04:00
5a39c44b56
merged .hgtags
2011-08-29 12:23:28 -04:00
f5a890453b
Added tag DRTVWR-86_3.0.2-beta2, 3.0.2-beta2 for changeset e5c9af2d7980
2011-08-29 12:12:40 -04:00
bdd053abcf
increment viewer version to 3.0.4
2011-08-29 09:27:25 -04:00
68a15f73c1
Added tag 3.0.3-start for changeset b95ddac176ac
2011-08-29 09:26:53 -04:00
f42f7130f5
merge changes for .v-pb
2011-08-29 09:25:31 -04:00
c34ab16ec1
merge tags back from viewer-beta
2011-08-29 09:23:59 -04:00
Logan Dethrow