33b0ae6ebf
Debugging changes. fixed broken pipe.
2014-01-23 17:04:33 -08:00
efc41f95bb
Removed debug line.
2014-01-22 10:23:50 -08:00
d223687fb8
char vs wchar_t FIGHT
2014-01-22 10:21:29 -08:00
ace79d9719
Heavy-handed attempt at fixing crashandloop hang.
2014-01-21 17:59:39 -08:00
00f12a2f12
Pulled merge from viewer-release.
2014-01-16 15:38:08 -08:00
033f0e8cce
What passess in MSVC may not pass in Teamcity.
2014-01-16 13:46:08 -08:00
d9b0980491
Fixed syntax issue that was wrapped in #if that didn't get hit until we got to teamcity. oops.
2014-01-16 10:37:10 -08:00
00aa2fee6d
Fixes from Windows build including utf-16 to utf-8 conversions.
2014-01-15 21:24:55 -08:00
ea7e6a5174
Some cleanup of string to wstring conversion and vice versa.
2014-01-14 15:28:35 -08:00
d8a81b240e
increment viewer version to 3.6.14
2014-01-08 18:46:23 -05:00
19a41cc243
Added tag 3.6.13-release for changeset 0d9b9e50f1a8
2014-01-08 18:45:48 -05:00
05fa5e525b
improve build.sh searches for additional package installers
2013-12-18 14:53:27 -05:00
ba39f6e14f
add "A" test channel package
2013-12-17 16:42:01 -05:00
35add2252b
MAINT-3575: remove old exe if found in current install directory
2013-12-11 17:43:55 -05:00
69dfa3507a
Workaround for MAINT 3099: remove any Vivox log file left in the program folder
2013-12-11 11:17:31 -05:00
9399448987
BUG-4685: remove any SecondLife.exe file left in the SecondLifeViewer folder by an install prior to 3.12
2013-12-11 09:53:48 -05:00
c017694d39
MAINT-3571: include settings_install.xml whether it contains settings or not
2013-12-10 15:42:21 -05:00
1269634e21
Pulled viewer-release
2013-12-09 14:31:08 -08: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
ce2cd00cc5
Removed debugging code.
2013-12-04 19:57:11 -08:00
56cbfdd55c
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489
2013-12-03 20:45:31 -05:00
6809348125
Creating a cleaner branch
2013-12-03 17:06:06 -08: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
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
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
10705b4360
Merge 3.6.11 for RC-ability
2013-11-11 15:50:01 -08: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
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
3a6228c44b
BUG-4286 add AMD R7/R9 entried to GPU table
2013-11-01 09:42:08 -07: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
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
6480612a91
Merge 3.6.9 ShareStorm
2013-10-25 10:23:11 -07:00
ea1e1b0925
increment viewer version to 3.6.10
2013-10-23 12:15:35 -04:00
76908954b9
Added tag 3.6.9-release for changeset 70eda3721d36
2013-10-23 11:52:24 -04:00
8881b47d22
MAINT-3331: On update, remove com.secondlife.indra.viewer.savedState.
2013-10-22 01:35:01 -04:00
62999da4d0
Pull merge from oz_linden/336-snowstorm
2013-10-17 13:05:08 -07:00
Aura Linden