Brad Payne (Vir Linden)
|
5e7f36541b
|
SH-3639 WIP - increased retry interval to allow for intermittent extremely slow responses
|
2013-01-10 13:22:48 -05:00 |
Brad Payne (Vir Linden)
|
4e1eda1c3b
|
SH-3344 WIP - keep avatar local textures flagged no-delete while in use
|
2013-01-07 18:31:28 -05:00 |
Brad Payne (Vir Linden)
|
81e759dde0
|
merge
|
2012-12-21 09:07:08 -05:00 |
Brad Payne (Vir Linden)
|
cbf24c55d5
|
SH-3344 WIP - additional debugging output for avatar local textures
|
2012-12-20 10:27:18 -05:00 |
Brad Payne (Vir Linden)
|
cd71008781
|
SH-3604 WIP - more frequent polling for retries
|
2012-12-18 13:07:01 -05:00 |
Brad Payne (Vir Linden)
|
67c66a12ab
|
SH-3604 WIP - fixed a case with retry logic
|
2012-12-18 12:45:10 -05:00 |
Brad Payne (Vir Linden)
|
42496cd672
|
SH-3629 WIP - avoid clobbering links to desired items that are already in the COF, as will be the case when wearing an outfit with required body parts missing
|
2012-12-17 18:34:13 -05:00 |
Brad Payne (Vir Linden)
|
ca9051c74c
|
merge
|
2012-12-17 16:51:57 -05:00 |
Brad Payne (Vir Linden)
|
fb99b1a1b4
|
SH-3629 WIP - fixed out-of-order outfit items
|
2012-12-17 16:51:25 -05:00 |
Brad Payne (Vir Linden)
|
b86a3e39cf
|
SH-3604 FIX - resolved an issue with simulated failures/retry logic
|
2012-12-17 13:24:57 -05:00 |
Don Kjer
|
7d173dffa9
|
Automated merge
|
2012-12-14 22:20:35 +00:00 |
Don Kjer
|
ae19262bf6
|
Reverting back to 32-bit colordepth requirement on linux
|
2012-12-14 20:23:52 +00:00 |
Don Kjer
|
ad80ebb869
|
Updating shaders to not crash when compiled in llvm
|
2012-12-14 20:11:45 +00:00 |
Don Kjer
|
f9b235adf8
|
Attempt at fixing linux shader support on ubuntu 12.04
|
2012-12-14 01:24:32 +00:00 |
prep@lindenlab.com
|
18ff702a99
|
Fix for SH-3591.
|
2012-12-13 16:53:38 -06:00 |
Don Kjer
|
8eef31e47a
|
Updating appearance utility to deal with IMG_INVISIBLE
|
2012-12-12 20:58:56 +00:00 |
Brad Payne (Vir Linden)
|
1701da7300
|
merge
|
2012-12-12 15:33:39 -05:00 |
Brad Payne (Vir Linden)
|
507080795f
|
SH-3604 WIP - fixed a failure when base outfit link did not need to be created
|
2012-12-12 15:32:31 -05:00 |
Brad Payne (Vir Linden)
|
46cfca5ed6
|
Fix for problem found with changing to an outfit with missing shape
|
2012-12-12 12:06:24 -05:00 |
prep
|
0b896a4953
|
Fixes for SH-3591 & SH-3620
|
2012-12-12 10:32:42 -05:00 |
Don Kjer
|
531394df23
|
Updating linux libGLOD to match darwin naming
|
2012-12-12 00:34:40 +00:00 |
Brad Payne (Vir Linden)
|
a5205d4d6a
|
merge
|
2012-12-11 18:22:41 -05:00 |
Brad Payne (Vir Linden)
|
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 |
Logan Dethrow
|
2807c0b942
|
Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal
|
2012-12-11 17:14:24 -05:00 |
Don Kjer
|
5798dd54cc
|
Fix for building on case-sensitive mac filesystems. Fix to remove unwind spam warnings while linking on xcode 4.5.2 builds
|
2012-12-11 13:56:50 -08:00 |
Logan Dethrow
|
0302573348
|
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
|
2012-12-11 16:38:10 -05:00 |
Oz Linden
|
edcdce226a
|
merge changes for DRTVWR-260
|
2012-12-10 15:33:39 -05:00 |
Oz Linden
|
d33ab2d3e0
|
tag merge of DRTVWR-260
|
2012-12-10 15:33:34 -05:00 |
Brad Payne (Vir Linden)
|
798377b076
|
SH-3606 WIP - fixed bug found by persnickety compiler
|
2012-12-10 15:32:42 -05:00 |
Oz Linden
|
a0d3781666
|
pull back release tags
|
2012-12-10 15:32:26 -05:00 |
Oz Linden
|
a334f41f8e
|
Added tag 3.4.3-release for changeset 5cba5f39d0a8
|
2012-12-10 15:24:49 -05:00 |
Oz Linden
|
623a06aabd
|
merge release tag
|
2012-12-10 15:24:08 -05:00 |
Brad Payne (Vir Linden)
|
6a5e227dc1
|
removed inadvertent commit of logcontrol.xml
|
2012-12-10 14:55:09 -05:00 |
Brad Payne (Vir Linden)
|
0777f53e2f
|
SH-3606 WIP - replaced several LLInventoryCallback subclasses with boost::func equivalents
|
2012-12-10 14:47:17 -05:00 |
Brad Payne (Vir Linden)
|
542a9e0a41
|
merge
|
2012-12-10 11:49:36 -05:00 |
Logan Dethrow
|
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 |
Logan Dethrow
|
b6a7c8fcfd
|
Merge in backed out changes.
|
2012-12-07 17:50:37 -05:00 |
Logan Dethrow
|
954200e97f
|
Backed out changeset 69636bceb5a2.
|
2012-12-07 17:48:50 -05:00 |
Logan Dethrow
|
77f58a7524
|
Backed out changeset 227671259809.
|
2012-12-07 17:48:10 -05:00 |
Logan Dethrow
|
8aa32015a9
|
Backed out changeset 5cf865a7afa7
|
2012-12-07 17:47:03 -05:00 |
Logan Dethrow
|
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 |
Logan Dethrow
|
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 |
Brad Payne (Vir Linden)
|
b75e632613
|
SH-3606 WIP - moving classes to more reusable location
|
2012-12-07 13:57:44 -05:00 |
Don Kjer
|
23d77d3a34
|
Automated merge
|
2012-12-06 22:56:21 +00:00 |
Don Kjer
|
07d05c2967
|
Alpha rendering fixes for appearance utility.
|
2012-12-06 22:54:50 +00:00 |
Logan Dethrow
|
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 |
Brad Payne (Vir Linden)
|
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 |
Nat Goodspeed
|
b6bf90c042
|
merge changes for MAINT-1955
|
2012-12-05 22:15:08 -05:00 |
Nat Goodspeed
|
a9ada0cc6a
|
merge changes for DRTVWR-259
|
2012-12-05 20:08:32 -05:00 |
Nat Goodspeed
|
168040bad2
|
tag merge of DRTVWR-259
|
2012-12-05 20:08:26 -05:00 |