8657da24cd
SH-3604 WIP - added base outfit link creation to retryable copy/link operations. Resolves race condition with cof version and server texture bakes
2012-12-11 18:21:09 -05:00
798377b076
SH-3606 WIP - fixed bug found by persnickety compiler
2012-12-10 15:32:42 -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
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
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
32f5015ecd
Added back in mesa package for linux builds
2012-12-05 14:33:30 -05:00
65998aaea8
Pull from viewer-development
2012-12-05 12:43:35 -05:00
6735d40d9a
SH-3604 WIP
2012-12-04 17:45:01 -05:00
a15ec8d014
tag merge of DRTVWR-255
2012-12-04 11:06:29 -05:00
3be13024c5
merge
2012-12-03 14:35:45 -05:00
5c245e941a
SH-3562 WIP
2012-12-03 14:34:00 -05:00
3e8fdb9daa
Fixed previous commit.
2012-12-01 00:12:32 +00:00
6cff95f8c7
Fix for STORM-1854. Adapted the fix based on other open source consumers of fontconfig that were encountering the same error.
2012-11-30 18:26:56 -05:00
f0a11b1590
SH-3594: Fix for crash when outfits are changed on a non server based baking region.
2012-11-30 16:59:15 -06:00
9934cd2e29
SH-3562 WIP - detect possible hangs in item copying
2012-11-30 17:41:07 -05:00
47a2a2982d
fix for possible crash on exit in self_av_string()
2012-11-29 11:06:10 -05:00
96ef49df75
Automated merge
2012-11-28 23:46:06 +00:00
dc71cae16b
Updating appearance utility
2012-11-28 23:45:23 +00:00
e0432f98ee
SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance.
2012-11-28 16:36:34 -05:00
f5a47417fd
merge changes for DRTVWR-230
2012-11-27 10:53:50 -05:00
f8a182ec37
tag merge of DRTVWR-230
2012-11-27 10:53:17 -05:00
c57a40da17
merge changes for DRTVWR-249
2012-11-26 12:40:54 -05:00
5a4b22e96b
tag merge of DRTVWR-249
2012-11-26 12:40:44 -05:00
a830812172
merge changes for DRTVWR-247
2012-11-20 15:37:54 -05:00
903b68a3ec
tag merge of DRTVWR-247
2012-11-20 15:37:45 -05:00
557293137c
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-20 14:46:24 -05:00
7ab282a09c
merge changes for DRTVWR-246
2012-11-20 11:30:31 -05:00
03cff74fb6
tag merge of DRTVWR-246
2012-11-20 11:23:24 -05:00
8b65c37250
merge changes for DRTVWR-229
2012-11-20 09:45:20 -05:00
ad527e8b1e
tag merge of DRTVWR-229
2012-11-20 09:45:14 -05:00
c4c5d3c9d3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-19 16:27:14 -08:00
62301cb883
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-19 12:01:51 -08:00
2d1a903d39
increment version to 3.4.4
2012-11-19 14:54:52 -05:00
b2f81f7900
merge tag for 3.4.2-release
2012-11-19 14:53:28 -05:00
d56a98dea4
Added tag 3.4.2-release for changeset 16310aabccf3
2012-11-19 14:51:03 -05:00
Brad Payne (Vir Linden)