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

290 Commits (ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a)

Author SHA1 Message Date
simon 64c5afa196 Merge latest viewer-release with FBC 2013-10-23 14:14:36 -07:00
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
simon 6d1c45f863 Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log message 2013-09-20 15:26:44 -07:00
Merov Linden 5b197db0c4 Pull from lindenlab/viewer-release 2013-09-19 13:45:39 -07:00
Graham Linden d310105121 Merge recent viewer-bear fixes that missed the boat 2013-09-25 13:16:31 -07:00
simon_linden d3625d0b67 Merge downstream code 2013-09-19 15:30:34 -07:00
PavelK ProductEngine 1015adf322 MAINT-2715 FIX Capabilities request handling not working properly if request gets lost 2013-07-25 19:37:15 +03:00
Oz Linden 9c8fdf5a49 fix bug reading RenderMaterialsCapability, improve logging for NORSPEC-206 2013-07-02 17:07:50 -04:00
Oz Linden 8ae792b38a move reading of the sim features to LLViewerRegion for consistency, a couple of minor cleanups 2013-06-28 16:18:08 -04:00
Oz Linden 5f397fa583 NORSPEC-206: read RenderMaterialsCapability throttle rate per second from simulator 2013-06-28 13:29:11 -04:00
Dave Parks 380785e613 Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials 2013-06-27 16:16:56 -05:00
Oz Linden 1c6783fdb5 NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if available 2013-06-26 09:43:01 -04:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Merov Linden 7da4c65191 Pull merge from lindenlab/viewer-release 2013-06-19 14:06:06 -07:00
Merov Linden 1c740dfb51 Pull merge from viewer-release 2013-05-22 14:21:49 -07:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
Merov Linden 2a7d604e87 ACME-306 : Pull merge from viewer-chui 2013-05-02 17:37:29 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
simon c4a45fca39 Enhance "duplicate seed caps" log message ... this needs more investigation. 
Reviewed by Kelly
 2013-04-25 11:05:06 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Cho 9a0cd53bda switched to use FacebookConnect and FacebookRedirect capabilities 2013-04-13 02:10:13 +01:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
simon d8dc74b833 MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. Reviewed by Kelly 2013-03-28 16:06:07 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Don Kjer 54cdc322b8 Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam. 2013-03-05 22:05:22 -08:00
prep c9feefb714 WIP: Removed caching of responder id. Code to dump the new and old seed caps when we receive multiple seedcaps for a region. 2013-02-28 16:22:27 -05:00
prep f92a830730 Bug fix# we don't want to be incrementing the responderid in the base responder 2013-02-28 13:40:36 -05:00
prep eae5cd57eb Renamed seedcap tracker class 2013-02-28 11:19:19 -05:00
prep 852ccab7a3 merge 2013-02-28 11:13:38 -05:00
prep 03b51b779f SH-3895. Added code to recognize if the second incoming regions seed caps differ in size from the initial region caps. Also avoid starting a inventory fetch responder if the requisite cap is missing" 2013-02-28 10:56:12 -05:00
Richard Linden 83eda3f152 Automated merge with https://bitbucket.org/lindenlab/sunshine-internal 2013-02-27 11:19:17 -08:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
Nyx Linden 11fe124ae9 merging in viewer-beta. 
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
 2013-01-24 16:22:49 -05:00
Logan Dethrow 9015344f8e Merged SH-3339 work with sunshine-internal. Still a WIP. 2012-12-13 18:35:07 -05:00
prep 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
Logan Dethrow 79dbaed158 Merge lindenlab/sunshine-internal -> log/sunshine-internal 2012-11-15 15:20:46 -05:00
Logan Dethrow f93604c399 WIP Working on adding http request to increment the COF version when a change is made to an item in an agent's current outfit folder. SH-3339 2012-11-15 15:20:05 -05:00
Brad Payne (Vir Linden) 51a1d510a5 SH-3541 WIP - fixed one cause of local textures failing to load 2012-11-14 13:09:54 -05:00
Dave Parks c431ddf629 Automated merge with http://bitbucket.org/lindenlab/viewer-development 2012-11-08 13:05:29 -06:00
William Todd Stinson a4945f36de Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-06 12:30:32 -08:00
Brad Payne (Vir Linden) d4dc41dbd5 misc error detection, debug coloration for avatar meshes 2012-11-01 14:19:00 -04:00
Kelly Washington 0cdff2817b Merge 2012-10-25 16:13:39 -07:00
simon@Simon-PC.lindenlab.com d6e3b0445a Merge in viewer-development code and fix build 2012-10-15 14:23:29 -07:00
William Todd Stinson 52e306d575 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-10-11 14:38:28 -07:00
Oz Linden 1709952adb pull back 3.4.1-beta6 fixes 2012-10-10 21:40:10 -04:00
William Todd Stinson 4a3bdb6896 Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179. 2012-10-10 15:10:48 -07:00
Dave Parks 374f20edf0 Fix non-thread-safe refcounting of LLHTTPClient::Responder and fix out-of-order deletion of LLTextureFetch on shutdown 2012-10-03 14:30:21 -05:00
Brad Payne (Vir Linden) 878eb2b61a audited uses of centralBakeVersion vs. isUsingServerBakes 2012-09-27 17:46:19 -04:00
Dave Parks 683c43c2e0 reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing. 2012-09-20 10:00:55 -04:00