Commit Graph

25350 Commits (e3b5d8b24ff7f79bd1aa422654fe50cf057ea00a)

Author SHA1 Message Date
Xiaohong Bao e3b5d8b24f more for MAINT-1955: Viewer crashes while login after clearing cache 2012-12-03 21:34:36 -07: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
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
Xiaohong Bao 8d07be9775 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2012-11-26 17:28:17 -07:00
Xiaohong Bao fe2f9e12f7 fix for MAINT-1955: Viewer crashes while login after clearing cache 2012-11-26 17:27:25 -07:00
Dave Parks 3df1e46588 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
Dave Parks e81a345340 MAINT-1953 Add NVIDIA GT 230 to gpu table 2012-11-26 14:02:32 -06:00
Dave Parks 4aa818055e MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
Reviewed by Simon
2012-11-26 13:22:25 -06:00
Dave Parks 0820124bee MAINT-1950 Fix for offscreen objects not getting rebuilt sometimes. 2012-11-21 16:15:35 -06:00
Dave Parks 5d34ac552f Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-11-20 17:03:55 -06:00
Dave Parks 8db983fb80 MAINT-1270 Fix for flexi prims showing up as discs when first loading.
Reviewed by Stinson.
2012-11-20 16:50:23 -06: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
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
Dave Parks f5b4a0af64 MAINT-1841 Fix for mac/linux build 2012-11-19 18:30:13 -06:00
William Todd Stinson c4c5d3c9d3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-19 16:27:14 -08:00
Dave Parks 7709b76469 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2012-11-19 17:41:30 -06:00
Dave Parks 7491fbd677 MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max performance
Reviewed by Simon.
2012-11-19 17:40:43 -06:00
William Todd Stinson 62301cb883 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-19 12:01:51 -08:00
Oz Linden 2d1a903d39 increment version to 3.4.4 2012-11-19 14:54:52 -05:00
Oz Linden b2f81f7900 merge tag for 3.4.2-release 2012-11-19 14:53:28 -05:00
Oz Linden d56a98dea4 Added tag 3.4.2-release for changeset 16310aabccf3 2012-11-19 14:51:03 -05:00
Oz Linden cca22d608d Added tag 3.4.3-beta1 for changeset 94ab2b49458a 2012-11-19 14:41:24 -05:00
William Todd Stinson f50b58a11b Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-19 11:24:57 -08:00
Oz Linden f362666df7 merge changes for DRTVWR-245 2012-11-19 11:31:01 -05:00
Oz Linden 6cd16bc537 tag merge of DRTVWR-245 2012-11-19 11:28:52 -05:00
Oz Linden f99d7bcd47 Added tag DRTVWR-232 for changeset f1d3b3fcab28 2012-11-19 11:25:08 -05:00
William Todd Stinson 6036ee9c42 MAINT-1890 FIX Removing previous hacky fix for this issue. The better solution is to clamp the update_period to a reasonable number of frames (32). 2012-11-16 17:26:01 -08:00
Kelly Washington ace013d26c MAINT-1942 Increase maximum animation length from 30 seconds to 60 seconds
reviewed with Simon
2012-11-16 16:22:17 -08:00
Oz Linden 185169cbbe correct attribution for STORM-1868 (add Wolf Loonie) 2012-11-15 11:29:38 -05:00
Oz Linden fc74c7a9da tag merge of DRTVWR-241 2012-11-14 21:18:45 -05:00
Nat Goodspeed b344612e4c DRTVWR-241: resolve merge conflict with viewer-development.
LLUI::setupPaths() went away with DRTVWR-210.
2012-11-14 16:00:02 -05:00
Nat Goodspeed 852e608599 Automated merge with http://hg.secondlife.com/viewer-development 2012-11-14 14:37:38 -05:00
Oz Linden 0e13bf5f9e merge changes for 3.4.2-beta4 2012-11-14 09:20:55 -05:00
Oz Linden 3c0f50ecaf tag merge of DRTVWR-210 2012-11-14 06:42:15 -05:00
Oz Linden a7a61adb29 Added tag 3.4.2-beta4 for changeset 73b84b9864dc 2012-11-14 06:34:26 -05:00
Nat Goodspeed 0e03562950 DRTVWR-210: sanitize ampersand embedded in strings.xml messages 2012-11-13 22:03:05 -05:00
Oz Linden dec9979af0 tag merge of DRTVWR-243 2012-11-13 21:34:01 -05:00
Maestro Linden a567c425ca MAINT-536 MAINT-1913 Added missing URL scheme filtering to the Linux viewer, changed URL scheme whitelist. Reviewed by Callum. 2012-11-14 02:24:58 +00:00
William Todd Stinson d7b55d0fa7 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-13 16:08:10 -08:00
Nat Goodspeed b6b12d0ded Automated merge with http://hg.secondlife.com/viewer-development 2012-11-13 19:04:25 -05:00
William Todd Stinson 951b4c3efb MAINT-1890: Adding a more descriptive comment to this hack fix for future reference. 2012-11-13 15:23:15 -08:00
William Todd Stinson 3d21b2302b MAINT-1891: FIX Updating the LLPipeline::clearRebuildGroups() to preserve HUD groups. clearRebuildGroups() is called during the teleport process. In the previous state, HUD objects were being incorrectly removed from the rebuild groups during the teleport process. This change will preserve HUD groups and should resolve this issue. 2012-11-13 15:16:26 -08:00
Oz Linden be210914f4 merge changes for DRTVWR-238 2012-11-13 11:57:14 -05:00
Oz Linden d8f081cf1b tag merge of DRTVWR-238 2012-11-13 11:57:09 -05:00
Oz Linden 7e779a29c1 merge changes for DRTVWR-209 2012-11-13 10:50:16 -05:00