0302573348
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
2012-12-11 16:38:10 -05:00
edcdce226a
merge changes for DRTVWR-260
2012-12-10 15:33:39 -05:00
d33ab2d3e0
tag merge of DRTVWR-260
2012-12-10 15:33:34 -05:00
798377b076
SH-3606 WIP - fixed bug found by persnickety compiler
2012-12-10 15:32:42 -05:00
a0d3781666
pull back release tags
2012-12-10 15:32:26 -05:00
a334f41f8e
Added tag 3.4.3-release for changeset 5cba5f39d0a8
2012-12-10 15:24:49 -05:00
623a06aabd
merge release tag
2012-12-10 15:24:08 -05:00
6a5e227dc1
removed inadvertent commit of logcontrol.xml
2012-12-10 14:55:09 -05:00
0777f53e2f
SH-3606 WIP - replaced several LLInventoryCallback subclasses with boost::func equivalents
2012-12-10 14:47:17 -05:00
542a9e0a41
merge
2012-12-10 11:49:36 -05:00
7e59b10413
Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake.
2012-12-07 19:38:12 -05:00
b6a7c8fcfd
Merge in backed out changes.
2012-12-07 17:50:37 -05:00
954200e97f
Backed out changeset 69636bceb5a2.
2012-12-07 17:48:50 -05:00
77f58a7524
Backed out changeset 227671259809.
2012-12-07 17:48:10 -05:00
8aa32015a9
Backed out changeset 5cf865a7afa7
2012-12-07 17:47:03 -05:00
cd65c2fcb8
Restored test_llcorehttp_peer.py, hopefully breaking the 'hg copy' link that was causing changesets intended for its copy parent to be applied to the child file.
2012-12-07 16:56:10 -05:00
d1981c11a4
Deleting test_llcorehttp_peer.py because it has been corrupted by changes to test_llsdmessage_peer.py, which it was copied from. The file will be recreated using an unchanged file.
2012-12-07 15:47:52 -05:00
b75e632613
SH-3606 WIP - moving classes to more reusable location
2012-12-07 13:57:44 -05:00
23d77d3a34
Automated merge
2012-12-06 22:56:21 +00:00
07d05c2967
Alpha rendering fixes for appearance utility.
2012-12-06 22:54:50 +00:00
97adf6422a
On Linux now use the default system python instead of defaulting to python2.5. This was a holdover from when on linden systems 2.5 was newer than the default, instead of older.
2012-12-06 21:59:54 +00:00
1d5b98929b
SH-3604 FIX - switched link creation in updateCOF() to use retry path, better stats reporting, fixed failure logic
2012-12-06 15:17:00 -05:00
b6bf90c042
merge changes for MAINT-1955
2012-12-05 22:15:08 -05:00
a9ada0cc6a
merge changes for DRTVWR-259
2012-12-05 20:08:32 -05:00
168040bad2
tag merge of DRTVWR-259
2012-12-05 20:08:26 -05:00
4c384aa4ab
merge changes for MAINT-1951
2012-12-05 20:07:25 -05:00
e1da5bda78
merge changes for DRTVWR-257
2012-12-05 18:18:16 -05:00
c5aeb0667f
tag merge of DRTVWR-257
2012-12-05 18:18:12 -05:00
476f6a0990
merge changes for MAINT-1953
2012-12-05 18:17:00 -05:00
2af1f6dbdf
removed yet another unintended commit of logcontrol.xml
2012-12-05 18:04:33 -05:00
03bdb9fe02
merge
2012-12-05 17:59:26 -05:00
bfa3bc0059
Possible fix for TC build failure
2012-12-05 17:58:35 -05:00
f952e72ff9
Merge.
2012-12-05 17:32:13 -05:00
1004eff4a2
Linux Viewer build fixes.
...
* Removed no longer used unpack_bufsize from bitpack_test.cpp
* Added llviewertexture_stub.cpp to the newview tests directory to fix llworldmap_test.cpp and llworldmipmap_test.cpp linker errors.
2012-12-05 17:29:52 -05:00
be9c0574f9
merge
2012-12-05 16:40:39 -05:00
7d419d5900
SH-3604 WIP - backed out logcontrol.xml change
2012-12-05 16:39:23 -05:00
480569677c
SH-3604 WIP - retry mechanism for batch inventory ops, handle either completion or failure
2012-12-05 16:38:21 -05:00
8a019b961b
merge changes for DRTVWR-258
2012-12-05 16:02:59 -05:00
ea98a58e36
tag merge of DRTVWR-258
2012-12-05 16:02:52 -05:00
0354b47a8f
merge changes for MAINT-1979
2012-12-05 16:01:37 -05:00
32f5015ecd
Added back in mesa package for linux builds
2012-12-05 14:33:30 -05:00
d9bcaf1821
merge changes for DRTVWR-256
2012-12-05 13:58:31 -05:00
907abfefc6
tag merge of DRTVWR-256
2012-12-05 13:58:09 -05:00
65998aaea8
Pull from viewer-development
2012-12-05 12:43:35 -05:00
377544c8b4
merge changes for MAINT-1955, MAINT-1958
2012-12-05 12:05:33 -05:00
5a938e3a1c
merge changes for DRTVWR-254
2012-12-05 09:36:38 -05:00
e6712cab31
tag merge of DRTVWR-254
2012-12-05 09:36:26 -05:00
b078a515e1
merge changes for DRTVWR-253
2012-12-04 21:13:35 -05:00
bb0fd8745b
tag merge of DRTVWR-253
2012-12-04 21:13:26 -05:00
cc2c426e88
merge changes for BUG-768
2012-12-04 21:10:30 -05:00
Logan Dethrow