2ea9f3d700
merge changes for 3.6.12-release
2013-12-17 11:15:01 -05:00
1a9b9f1bd1
increment viewer version to 3.6.13
2013-12-09 14:52:47 -05:00
65123c4029
Added tag 3.6.12-release for changeset 88bbfd7a6971
2013-12-09 14:52:45 -05:00
56cbfdd55c
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489
2013-12-03 20:45:31 -05:00
0c6d06692e
merge changes for storm-1987
2013-11-27 12:02:04 -05:00
d533dcebf7
STORM-1987 Inconsistent menu naming and behavior in Places floater
2013-11-27 10:26:27 -05:00
ced4ccdbd2
merge changes for storm-1984
2013-11-26 19:18:04 -05:00
a55f88109f
MAINT-3489: Gracefully handle missing downloaded installer file.
...
If a marker file indicates that an installer has been downloaded and verified
and is ready to install, but that installer file does not exist, log it and
revert to checking for update.
Also add logging to every code path that can remove the installer explicitly,
in case the missing installer is actually being killed off by some weird
sequence of state-machine transitions.
2013-11-26 17:18:28 -05:00
fe3a930623
merge fix for STORM-1984
2013-11-26 16:09:43 -05:00
52ec6f9af0
remove excessively complex fixes for MAINT-2914 and MAINT-3142
2013-11-26 15:09:55 -05:00
9e986201ba
MAINT-3489: Make Mac updater script detect prematurely deleted .dmg.
...
Also, delete it when done.
2013-11-26 09:25:10 -05:00
6c44fe90f2
remove obsolete INSTFLAGS references from installer
2013-11-25 15:52:59 -05:00
79919ef9b6
move setting default grid to settings_install.xml so that it works on all platforms
2013-11-24 13:18:12 -05:00
6d6b0edfe2
normalize format of and add arch to all installer names
2013-11-24 13:16:36 -05:00
45bc601563
merge changes for 3.6.11-release
2013-11-21 14:08:38 -05:00
787ccaf297
increment viewer version to 3.6.12
2013-11-21 14:05:30 -05:00
bcf2611279
Added tag 3.6.11-release for changeset 2feb70a4cfde
2013-11-21 14:05:28 -05:00
4f2a7167b6
merge changes for open-196
2013-11-21 11:29:28 -05:00
ecb2220afd
add handler for socket.error to fix OPEN-196
2013-11-18 12:12:31 -05:00
84a96cdf0f
correct attribution for open-195
2013-11-18 11:33:58 -05:00
54ad1935d3
merge changes for WOLF-444
2013-11-14 18:04:00 -05:00
3358102462
STORM-1984: Mousing over UI elements does not make them light up
2013-11-14 22:13:15 +01:00
a87637119a
merge changes for WOLF-444
2013-11-14 15:33:17 -05:00
f8846713ce
add open-195 to doc/contributions.txt
2013-11-14 09:16:34 -05:00
79e38f35b5
merge changes for open-195
2013-11-14 09:12:38 -05:00
e5b0670ad7
OPEN-195 Cleaned non-UTF8 safe characters
2013-11-13 19:27:17 -05:00
10705b4360
Merge 3.6.11 for RC-ability
2013-11-11 15:50:01 -08:00
d1b4c5bf73
merge changes for 3.6.10-release
2013-11-11 16:40:22 -05:00
ebc9bcbf69
convert dos line endings
2013-11-11 15:26:55 -05:00
b8cafb8e85
increment viewer version to 3.6.11
2013-11-11 15:26:19 -05:00
424e8687e4
Added tag 3.6.10-release for changeset 5b54b36862ff
2013-11-11 15:25:46 -05:00
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
9ad67587b7
DRTVWR-338 Make an inocuous change to get a new build number out of TeamCity
2013-11-07 16:18:17 -06:00
976ad95977
Shot in the dark patch for MAINT-3353 backported from viewer-tiger
2013-11-05 13:01:25 -08:00
5ca4a4b8f3
merge changes for storm-1982
2013-11-05 13:53:23 -05:00
2454bcc8db
STORM-=1982 Remove duplicate entry in settings.xml
2013-11-05 10:24:41 -05:00
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
e3739edeff
BUG-3764: Groups count in groups list does not display if floater is resized
2013-11-02 21:57:06 +01:00
3a6228c44b
BUG-4286 add AMD R7/R9 entried to GPU table
2013-11-01 09:42:08 -07:00
d61c6ad48b
merge changes for storm-1975
2013-11-01 08:46:32 -04:00
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
c5df71b1c4
STORM-1975 Convert old-style debugging lines to new-style
2013-10-29 16:21:17 -04:00
07c011bc9c
STORM-1975 IM windows occasionally report false typing status.
2013-10-29 15:12:39 -04:00
07b5e702e6
BUG-3968: do not wear an object when renaming in inventory
2013-10-29 13:59:21 -04:00
994ecbed34
add credit for BUG-3863
2013-10-29 13:53:43 -04:00
309d16ebdb
Pull merge from lindenlab/viewer-fbc
2013-10-28 17:19:14 -07:00
3a57a67c5d
ACME-1099 : Fix crash when getting the Facebook cap from a (potentially null) region
2013-10-28 17:15:57 -07:00
57040ea70e
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331
2013-10-28 20:06:18 -04:00
d5877bc365
MAINT-3343 FIXED Expand/Collapse message pan only on left click.
2013-10-28 14:37:06 +02:00
970ee73e9a
Fix release merge issues (included upstream changes not yet in release from bear)
2013-10-25 11:48:43 -07:00
Oz Linden