Commit Graph

29911 Commits (ced4ccdbd295216e57755b81b5b04df5b6022d4d)

Author SHA1 Message Date
Oz Linden ced4ccdbd2 merge changes for storm-1984 2013-11-26 19:18:04 -05:00
Oz Linden fe3a930623 merge fix for STORM-1984 2013-11-26 16:09:43 -05:00
Oz Linden 52ec6f9af0 remove excessively complex fixes for MAINT-2914 and MAINT-3142 2013-11-26 15:09:55 -05:00
Oz Linden 45bc601563 merge changes for 3.6.11-release 2013-11-21 14:08:38 -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
Oz Linden 4f2a7167b6 merge changes for open-196 2013-11-21 11:29:28 -05:00
Oz Linden ecb2220afd add handler for socket.error to fix OPEN-196 2013-11-18 12:12:31 -05:00
Oz Linden 84a96cdf0f correct attribution for open-195 2013-11-18 11:33:58 -05:00
Oz Linden 54ad1935d3 merge changes for WOLF-444 2013-11-14 18:04:00 -05:00
Ansariel 3358102462 STORM-1984: Mousing over UI elements does not make them light up 2013-11-14 22:13:15 +01:00
Oz Linden a87637119a merge changes for WOLF-444 2013-11-14 15:33:17 -05:00
Oz Linden f8846713ce add open-195 to doc/contributions.txt 2013-11-14 09:16:34 -05:00
Oz Linden 79e38f35b5 merge changes for open-195 2013-11-14 09:12:38 -05:00
Drake Arconis e5b0670ad7 OPEN-195 Cleaned non-UTF8 safe characters 2013-11-13 19:27:17 -05:00
Graham Linden 10705b4360 Merge 3.6.11 for RC-ability 2013-11-11 15:50:01 -08:00
Oz Linden d1b4c5bf73 merge changes for 3.6.10-release 2013-11-11 16:40:22 -05: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
Oz Linden 5ca4a4b8f3 merge changes for storm-1982 2013-11-05 13:53:23 -05:00
Jonathan Yap 2454bcc8db STORM-=1982 Remove duplicate entry in settings.xml 2013-11-05 10:24:41 -05: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
Ansariel e3739edeff BUG-3764: Groups count in groups list does not display if floater is resized 2013-11-02 21:57:06 +01:00
Graham Linden 3a6228c44b BUG-4286 add AMD R7/R9 entried to GPU table 2013-11-01 09:42:08 -07:00
Oz Linden d61c6ad48b merge changes for storm-1975 2013-11-01 08:46:32 -04:00
Jonathan Yap ef825a1d2c STORM-1975 Changed timeout constants to
ME_TYPING_TIMEOUT = 4.0
OTHER_TYPING_TIMEOUT = 9.0
2013-10-30 16:20:32 -04:00
Jonathan Yap c5df71b1c4 STORM-1975 Convert old-style debugging lines to new-style 2013-10-29 16:21:17 -04:00
Jonathan Yap 07c011bc9c STORM-1975 IM windows occasionally report false typing status. 2013-10-29 15:12:39 -04:00
Tonya Souther 07b5e702e6 BUG-3968: do not wear an object when renaming in inventory 2013-10-29 13:59:21 -04:00
Oz Linden 994ecbed34 add credit for BUG-3863 2013-10-29 13:53:43 -04: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
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