Commit Graph

29885 Commits (d533dcebf77aa5d62c15488b3e6bed97ecffec02)

Author SHA1 Message Date
Jonathan Yap d533dcebf7 STORM-1987 Inconsistent menu naming and behavior in Places floater 2013-11-27 10:26:27 -05:00
Oz Linden 787ccaf297 increment viewer version to 3.6.12 2013-11-21 14:05:30 -05:00
Oz Linden bcf2611279 Added tag 3.6.11-release for changeset 2feb70a4cfde 2013-11-21 14:05:28 -05:00
Graham Linden 10705b4360 Merge 3.6.11 for RC-ability 2013-11-11 15:50:01 -08:00
Oz Linden ebc9bcbf69 convert dos line endings 2013-11-11 15:26:55 -05:00
Oz Linden b8cafb8e85 increment viewer version to 3.6.11 2013-11-11 15:26:19 -05:00
Oz Linden 424e8687e4 Added tag 3.6.10-release for changeset 5b54b36862ff 2013-11-11 15:25:46 -05:00
Graham Linden 66b6bffca9 MAINT-3412 Fix Intel Iris recognizer to include optional Pro as is reported with integrated-only graphics on new MBP 2013-11-08 09:39:24 -08:00
Dave Parks 9ad67587b7 DRTVWR-338 Make an inocuous change to get a new build number out of TeamCity 2013-11-07 16:18:17 -06:00
Aura Linden 976ad95977 Shot in the dark patch for MAINT-3353 backported from viewer-tiger 2013-11-05 13:01:25 -08:00
maksymsproductengine 71205580d9 MAINT-3376 FIXED Successive llSetTextureAnim calls fail in 3.6.10 (283075) unless a different command (llSleep(0.01), llSay(0,"hello")) is placed between them.:
- fix for MAINT-2861 was reverted to resolve this issue;
2013-11-05 04:23:12 +02:00
Graham Linden 3a6228c44b BUG-4286 add AMD R7/R9 entried to GPU table 2013-11-01 09:42:08 -07:00
Merov Linden 309d16ebdb Pull merge from lindenlab/viewer-fbc 2013-10-28 17:19:14 -07:00
Merov Linden 3a57a67c5d ACME-1099 : Fix crash when getting the Facebook cap from a (potentially null) region 2013-10-28 17:15:57 -07:00
Nat Goodspeed 57040ea70e Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331 2013-10-28 20:06:18 -04:00
Mnikolenko ProductEngine d5877bc365 MAINT-3343 FIXED Expand/Collapse message pan only on left click. 2013-10-28 14:37:06 +02:00
Graham Linden 970ee73e9a Fix release merge issues (included upstream changes not yet in release from bear) 2013-10-25 11:48:43 -07:00
Graham Linden d4e622daf2 MAINT-3356 GPU Table update to support Retina MBP 'Intel Iris OpenGL Engine' driver id on Mavericks. 2013-10-25 11:16:44 -07:00
Graham Linden 6480612a91 Merge 3.6.9 ShareStorm 2013-10-25 10:23:11 -07:00
Oz Linden ea1e1b0925 increment viewer version to 3.6.10 2013-10-23 12:15:35 -04:00
Oz Linden 76908954b9 Added tag 3.6.9-release for changeset 70eda3721d36 2013-10-23 11:52:24 -04:00
Nat Goodspeed 8881b47d22 MAINT-3331: On update, remove com.secondlife.indra.viewer.savedState. 2013-10-22 01:35:01 -04:00
Merov Linden 62999da4d0 Pull merge from oz_linden/336-snowstorm 2013-10-17 13:05:08 -07:00
Graham Linden 2f0d9b78d2 Fix merge error in llvoavatar 2013-10-16 15:49:14 -07:00
Graham Linden a19f4ae2b3 Merge 3.6.8 2013-10-16 15:02:29 -07:00
Scott Lawrence 3986a358db Merged 3.6.8-release 2013-10-16 17:26:02 -04:00
Scott Lawrence 7ba4fc06f3 Merged 3.6.8-release 2013-10-16 17:24:32 -04:00
oz@lindenlab.com c7057c141c increment viewer version to 3.6.9 2013-10-16 17:16:25 -04:00
oz@lindenlab.com 9ca1358d42 Added tag 3.6.8-release for changeset d40c66e41074 2013-10-16 17:14:18 -04:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Dave Parks 929311869b MAINT-2968 Transplant cleanup. 2013-10-11 17:10:26 -05:00
Dave Parks 0e116741a0 MAINT-2968 Fix for crash on AMD hardware running current drivers. 2013-10-10 18:00:11 -05:00
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
Oz Linden ba7a564700 improve preference label for fly/jump 2013-10-03 18:21:19 -04:00
Oz Linden 4dccf30bf3 merge changes for 3.6.7-release 2013-10-03 18:04:27 -04:00
Oz Linden f7158bc5af increment viewer version to 3.6.8 2013-10-03 18:03:25 -04:00
Oz Linden 272d588168 Added tag 3.6.7-release for changeset ae457ece7700 2013-10-03 18:02:38 -04:00
MaximB ProductEngine f806073646 MAINT-3193 FIXED crash with LLControlCache<bool>::LLControlCache: Control named RenderAutoMuteLoggingnot found. 2013-09-30 11:40:01 +03:00
Graham Madarasz (Graham Linden) 4bc9393240 MAINT-3155 add cocoa equiv for former AppleEventManager shenanigans for SLURL handling 2013-09-26 18:53:12 -07:00
Graham Linden db18ad3b2a Merge lion to get Mac fix 2013-09-26 12:34:19 -07:00
Graham Linden d623b1dfd5 Merge 2013-09-26 12:06:49 -07:00
Graham Linden fb6da3bcae Last minute suggestions for IvyBridge Intel 2500 and nVidia 400 series expected GL settings from TankMaster Finesmith 2013-09-26 11:49:16 -07:00
Graham Linden 037cbf8231 Merge lion for good measure 2013-09-26 11:45:07 -07:00
Graham Linden 0103cac1dd Merge viewer-bear maint RC changes to get this build closer to the RC it will follow 2013-09-26 11:44:40 -07:00
Graham Linden e285d515d5 NORSPEC-281 bring back a classic normal generation fix from runitai's personal collection 2013-09-26 11:32:57 -07:00
Graham Madarasz (Graham Linden) b8a1fd33f5 Try all you want multichar constant, but you'll never be a string to me! (fix mac build errors from 'curious' filepicker literals) 2013-09-26 10:12:33 -07:00
Graham Linden badb8a945d NORSPEC-259 revive fix stomped with materials->bear merge 2013-09-26 09:23:47 -07:00
Graham Linden 4709ca9697 NORSPEC-259 revive fix stomped with materials->bear merge 2013-09-26 09:23:47 -07:00
Graham Linden c56b410bdb BUG-3984 fix broken rendering of particles using blend funcs 2013-09-25 14:08:58 -07:00
Graham Linden 05c6d59faa BUG-3984 fix broken rendering of particles using blend funcs 2013-09-25 14:08:58 -07:00