livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,621 Commits
2 Branches
0 Tags
301 MiB
Commit Graph

25621 Commits (b79d5d7c583aeac392fb3e6eebbb2dcdebcedfcc)

Author SHA1 Message Date
Kitty Barnett b79d5d7c58 Merged with viewer-sunshine tip (Revision bd1162cb6fbe) 
--HG--
branch : Viewer-Build
 2012-12-18 16:00:02 +01: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
Nat Goodspeed 4c384aa4ab merge changes for MAINT-1951 2012-12-05 20:07:25 -05:00
Nat Goodspeed e1da5bda78 merge changes for DRTVWR-257 2012-12-05 18:18:16 -05:00
Nat Goodspeed c5aeb0667f tag merge of DRTVWR-257 2012-12-05 18:18:12 -05:00
Nat Goodspeed 476f6a0990 merge changes for MAINT-1953 2012-12-05 18:17:00 -05:00
Brad Payne (Vir Linden) 2af1f6dbdf removed yet another unintended commit of logcontrol.xml 2012-12-05 18:04:33 -05:00
Brad Payne (Vir Linden) 03bdb9fe02 merge 2012-12-05 17:59:26 -05:00
Brad Payne (Vir Linden) bfa3bc0059 Possible fix for TC build failure 2012-12-05 17:58:35 -05:00
Logan Dethrow f952e72ff9 Merge. 2012-12-05 17:32:13 -05:00
Logan Dethrow 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
Brad Payne (Vir Linden) be9c0574f9 merge 2012-12-05 16:40:39 -05:00
Brad Payne (Vir Linden) 7d419d5900 SH-3604 WIP - backed out logcontrol.xml change 2012-12-05 16:39:23 -05:00
Brad Payne (Vir Linden) 480569677c SH-3604 WIP - retry mechanism for batch inventory ops, handle either completion or failure 2012-12-05 16:38:21 -05:00
Nat Goodspeed 8a019b961b merge changes for DRTVWR-258 2012-12-05 16:02:59 -05:00
Nat Goodspeed ea98a58e36 tag merge of DRTVWR-258 2012-12-05 16:02:52 -05:00