Commit Graph

29922 Commits (2ea9f3d700b72efa1cd486fa89a749b04415d3c2)

Author SHA1 Message Date
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
JJ Linden 9c6bd3b395 merged in recent changes 2013-10-21 14:36:34 -07: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
JJ Linden dc431ea6d2 merged in recent changes 2013-10-10 16:44:22 -07:00
JJ Linden 3aea5a5a6a adding quicklinks for extra packages:w 2013-10-10 16:44:05 -07: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
JJ Linden a6c20ae524 merging 2013-09-30 15:41:51 -07: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
Graham Linden f48581b625 Fix decl of merged genBBoxes func to match merge impl 2013-09-25 13:52:10 -07:00
Graham Linden d310105121 Merge recent viewer-bear fixes that missed the boat 2013-09-25 13:16:31 -07:00
Graham Linden 571920c7b4 BUG-3982 add code to subtract the lack of not removing the removal of backfaces for particles (make particles render double-sided again) 2013-09-25 12:29:02 -07:00
Oz Linden bd18f3c097 merge more changes for CHOP-985 2013-09-24 10:10:03 -04:00
Graham Linden 71e986b059 NORSPEC-285 fix merge error with attenuation on alpha masquerading as this norspec from wayback 2013-09-23 14:49:10 -07:00
Graham Linden 29216ac5e7 MAINT-3179 fix bad indexing of position info generating false alarms on range checks, issue with free of data now allocated contig with positions instead, and added copious amounts of llwarns to error return sites so 'invalid element' will be a reason to read the log and not a tease. 2013-09-23 13:43:01 -07:00
JJ Linden 6c13c4dd55 made change to include channel name in the settings_install.xml file generated. changed so that sourceid is not part of a list of options pulled into that file, along with the channel 2013-09-23 13:26:24 -07:00
MaximB ProductEngine 089081dc80 merge 2013-09-23 20:28:23 +03:00
Mnikolenko ProductEngine 3bfac42f07 MAINT-3159 FIXED Disable buttons when refreshing ui. 2013-09-23 13:07:56 +03:00
MaximB ProductEngine 3e934d5089 MAINT-3151 (Issue with urls being autoclicked when holding left click into an unfocused textbox then dragging pointer over a url and releasing.) 2013-09-23 09:14:53 +03:00
Graham Linden 62b3bb9df5 Merge 2013-09-20 16:45:32 -07:00
Graham Linden 2a03e8f9fb MAINT-3172 fix rendering regressions from release mergedown 2013-09-20 16:44:39 -07:00
simon 6d1c45f863 Fix AvatarRenderInfo cap broken in merge, add a new diagnostic log message 2013-09-20 15:26:44 -07:00