Commit Graph

25250 Commits (b6bf90c042cd84544e0bcb36841c5e438e64669b)

Author SHA1 Message Date
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
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
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
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
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
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
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
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 9a8cf6603f MAINT-1958 Fix for linux build after transplant. 2012-11-30 12:21:01 -06:00
Monty Brandenberg 4d65c754d6 Tweak the example program (used as a performance tester) so that it
will run with higher connection concurrencies.  I'm using this to
test the listener queue length reporting on apaches and everything
is consistent and as expected with this change (stuck at eight before).
2012-11-27 18:09:01 +00:00
Oz Linden f5a47417fd merge changes for DRTVWR-230 2012-11-27 10:53:50 -05:00
Oz Linden f8a182ec37 tag merge of DRTVWR-230 2012-11-27 10:53:17 -05:00
Xiaohong Bao a1c52b7cd1 fix for MAINT-1955: Viewer crashes while login after clearing cache 2012-11-26 17:27:25 -07:00
Dave Parks 72cbe5b942 MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering enabled.
Reviewed by VoidPointer
2012-11-26 17:10:22 -06:00
Monty Brandenberg f175b5a20f BUG-768 Texture fetches hit caps throttle and need more retries.
Bumped the default retry limit up from 5 to 8 which gives up to
15 seconds more dwell time should the viewer get a 503 or other
recoverable error on access.
2012-11-26 16:19:48 -05:00
Dave Parks db96e37218 MAINT-1953 Add NVIDIA GT 230 to gpu table 2012-11-26 14:02:32 -06:00
Dave Parks 73d1b4f79c MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
Reviewed by Simon
2012-11-26 13:22:25 -06:00
Oz Linden c57a40da17 merge changes for DRTVWR-249 2012-11-26 12:40:54 -05:00
Oz Linden 5a4b22e96b tag merge of DRTVWR-249 2012-11-26 12:40:44 -05:00
Oz Linden a830812172 merge changes for DRTVWR-247 2012-11-20 15:37:54 -05:00
Oz Linden 903b68a3ec tag merge of DRTVWR-247 2012-11-20 15:37:45 -05:00
Nat Goodspeed 557293137c Automated merge with http://hg.secondlife.com/viewer-development 2012-11-20 14:46:24 -05:00
Oz Linden 7ab282a09c merge changes for DRTVWR-246 2012-11-20 11:30:31 -05:00
Oz Linden 03cff74fb6 tag merge of DRTVWR-246 2012-11-20 11:23:24 -05:00
Oz Linden 8b65c37250 merge changes for DRTVWR-229 2012-11-20 09:45:20 -05:00
Oz Linden ad527e8b1e tag merge of DRTVWR-229 2012-11-20 09:45:14 -05:00
William Todd Stinson c4c5d3c9d3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-19 16:27:14 -08:00
William Todd Stinson 62301cb883 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-19 12:01:51 -08:00