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

25946 Commits (e4e01ea7cce42ca5eac28ceff2b111e52dfd939b)

Author SHA1 Message Date
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
Richard Linden 68967e7b2b SH-3406 WIP convert fast timers to lltrace system 
changed thread id declaration to be local to llthread.cpp and use
currentID() uniformly across platforms
 2012-12-05 14:22:18 -08: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
Nat Goodspeed 0354b47a8f merge changes for MAINT-1979 2012-12-05 16:01:37 -05:00
Nat Goodspeed d9bcaf1821 merge changes for DRTVWR-256 2012-12-05 13:58:31 -05:00
Nat Goodspeed 907abfefc6 tag merge of DRTVWR-256 2012-12-05 13:58:09 -05:00
Nat Goodspeed 377544c8b4 merge changes for MAINT-1955, MAINT-1958 2012-12-05 12:05:33 -05:00
Nat Goodspeed 5a938e3a1c merge changes for DRTVWR-254 2012-12-05 09:36:38 -05:00
Nat Goodspeed e6712cab31 tag merge of DRTVWR-254 2012-12-05 09:36:26 -05:00
Richard Linden 6c7825107f SH-3406 WIP convert fast timers to lltrace system 
added copy constructor to periodic recording to allow snapshot generation
in fast timer view
fixed build errors
 2012-12-04 19:10:02 -08:00
Nat Goodspeed b078a515e1 merge changes for DRTVWR-253 2012-12-04 21:13:35 -05:00
Nat Goodspeed bb0fd8745b tag merge of DRTVWR-253 2012-12-04 21:13:26 -05:00
Nat Goodspeed cc2c426e88 merge changes for BUG-768 2012-12-04 21:10:30 -05:00
simon@Simon-PC.lindenlab.com 57db08d792 Fix merge breakage 2012-12-04 17:45:19 -08:00
simon@Simon-PC.lindenlab.com 7fe4fbe674 Pull in upstream viewer-development via viewer-lion 2012-12-04 15:03:34 -08:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
Dave Parks 1f2b88803e MAINT-1953 Run through viewer stats and update GPU table with missing entries and new expected OpenGL versions 2012-12-04 16:10:15 -06:00
Nat Goodspeed 87b4386ac6 merge changes for DRTVWR-251 2012-12-04 17:09:23 -05:00
Nat Goodspeed 7515736c68 tag merge of DRTVWR-251 2012-12-04 17:09:06 -05:00
Nat Goodspeed 68fffbc5e3 merge changes for MAINT-1953 2012-12-04 16:33:44 -05:00
simon@Simon-PC.lindenlab.com fddd386804 Pull back upstream fixes from viewer-lion 2012-12-04 10:52:26 -08:00
Nat Goodspeed a15ec8d014 tag merge of DRTVWR-255 2012-12-04 11:06:29 -05:00
Nat Goodspeed a2bdc1d2d3 tag merge of DRTVWR-252 2012-12-04 10:41:20 -05:00
Xiaohong Bao 11bebcbcac more for MAINT-1955: Viewer crashes while login after clearing cache 2012-12-03 21:34:36 -07:00
Xiaohong Bao e3b5d8b24f more for MAINT-1955: Viewer crashes while login after clearing cache 2012-12-03 21:34:36 -07:00
Richard Linden 407e5013f3 SH-3406 WIP convert fast timers to lltrace system 
converted fast timer view over to new lltrace mechanisms
 2012-12-03 19:54:53 -08:00
Kelly Washington 5c22524f29 MAINT-1979 Viewer crashes while attempting to join group in the moment of loading group members 
* Fix one race condition that could dereference a dangling pointer.
reviewed with Simon and Baker.
 2012-12-03 16:37:05 -08:00
Kelly Washington 28d8aade82 MAINT-1748 Users have an ability to sell non existing objects from content of other object 
*  Keep the buy-contents floater subscribed to inventory changes on the object.
reviewed with Simon
 2012-12-03 13:18:46 -08:00
Richard Linden 13e4edf1cd SH-3406 WIP convert fast timers to lltrace system 
started moving fast timer historical stats over to LLTrace periodic
recording
 2012-12-02 23:00:36 -08:00
Xiaohong Bao 0270ce079c more for SH-3350, add debug texts 2012-12-02 22:12:43 -07:00
Richard Linden 4f9a5d0554 fix for gcc compile errors 2012-12-01 12:49:01 -08:00
Richard Linden ca2207bd35 SH-3406 WIP convert fast timers to lltrace system 
fixed scale of reported times
moved reset calls to happen at same time so we don't show partial results
 2012-12-01 00:17:04 -08:00
Xiaohong Bao 21409a3aaa for SH-3350 and SH-3353: Report frame-to-frame visual deltas as an LLStat 2012-11-30 22:50:06 -07:00
Dave Parks 99c5b21ee7 MAINT-1958 Trivial change to kick teamcity into behaving. 2012-11-30 19:32:22 -06:00
Logan Dethrow 3e8fdb9daa Fixed previous commit. 2012-12-01 00:12:32 +00:00
Richard Linden ca37317a14 SH-3406 WIP convert fast timers to lltrace system 
fixed crash when sending viewer asset stats
 2012-11-30 15:48:22 -08:00
Dave Parks 9c205ee9e2 MAINT-1958 More robust error handling -- handle the case where the FBO allocation failure occurs when enabling lighting and shadows. 2012-11-30 17:47:12 -06:00
Logan Dethrow 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
Dave Parks 06a5cc5285 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2012-11-30 17:03:48 -06:00
Dave Parks e83700b56d MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to update their drivers. 
Reviewed by Simon
 2012-11-30 17:03:12 -06:00
Dave Parks 9a8cf6603f MAINT-1958 Fix for linux build after transplant. 2012-11-30 12:21:01 -06:00
Aura Linden 9085dc3e84 Removed logging. 2012-11-30 00:46:02 -08:00
Aura Linden 1149c94c5b Crashlogger only runs when it comes from teamcity so I must checkin debug and wait. What fun. 2012-11-29 23:33:31 -08:00
Richard Linden 02d503bf8f SH-3406 WIP convert fast timers to lltrace system 
moved runtime timer tree topology information to separate array instead of recording stack
 2012-11-29 00:43:25 -08:00
eli bf28ce0eea sync with viewer-development 2012-11-28 12:10:00 -08:00