6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
24b7fd1c7f
merge with release
2013-12-09 11:55:02 -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
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
57040ea70e
Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3331
2013-10-28 20:06:18 -04:00
8881b47d22
MAINT-3331: On update, remove com.secondlife.indra.viewer.savedState.
2013-10-22 01:35:01 -04:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
4720f67bf7
Merge with viewer-release.
2013-12-13 21:21:45 +01:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
a359d9d80c
merge changes for 3.6.4-release
2013-08-27 10:37:02 -04:00
a4e7444985
correct merge error in llupdatechecker.cpp
2013-08-26 16:43:03 -04:00
7ca10e5161
merge changes for 3.6.4-release
2013-08-26 15:14:12 -04:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
d0432d4d4c
CHOP-975: Remove fallback to v1.0 update query when the v1.1 gets a 404 response
2013-07-30 11:53:47 -04:00
2be8585baa
merge changes for DRTVWR-325
2013-07-15 16:55:27 -04:00
3e6ce2dbad
add some validation of update response before starting download
2013-07-13 15:04:18 -04:00
34c77159f7
CHOP-963: Make update service query url depend on the grid rather than settings
2013-07-09 08:39:22 -07:00
9c83d4b5b8
Merge with viewer-release.
2013-06-19 15:47:57 -04:00
aa8abe5e1c
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2013-06-19 12:43:50 -04:00
0af636e632
Merged with viewer-release
2013-06-17 04:39:47 -04:00
2b8cd2fccf
MAINT-2333: Use bouncing progress bar for Linux updater message.
...
This eliminates the user expectation that s/he must click OK before the
updater will begin installing the new viewer.
2013-06-11 19:23:38 -04:00
50689a13ba
BOOG2707 uncomment cleared suspects
2013-06-05 06:14:27 -07:00
ea24612561
BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-04 07:51:27 -07:00
842a6c6e46
BUG-2707 disable more login/update-sequence specific logging
2013-06-02 14:41:57 -07:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
fc4a6431c9
CHOP-942: fix crash if update check times out
2013-05-13 16:28:50 -04:00
545e033d1e
merge changes for DRTVWR-299
2013-05-07 15:11:55 -04:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
98e02a5d76
Merge new boost and add OS X 10.8 mods
2013-02-22 09:49:58 -08:00
d8ce2ec0a0
MAINT-2389: Tell CMake viewer_components/login depends on Boost.Context
...
This addresses a Linux link failure due to the Linux linker making a single
left-to-right pass through libraries.
2013-02-21 18:57:24 -05:00
54e2d2b000
MAINT-2389: Change viewer to Boost package without ucontext.h.
...
In autobuild.xml, specify today's build of the Boost package that includes the
Boost.Context library, and whose boost::dcoroutines library uses Boost.Context
exclusively instead of its previous context-switching underpinnings (source of
the ucontext.h dependency).
Add BOOST_CONTEXT_LIBRARY to Boost.cmake and Copy3rdPartyLibs.cmake. Link it
with the viewer and with the lllogin.cpp test executable.
Track new Boost package convention that our (early, unofficial) Boost.Coroutine
library is now accessed as boost/dcoroutine/etc.h and boost::dcoroutines::etc.
Remove #include <boost/coroutine/coroutine.hpp> from
llviewerprecompiledheaders.h and lllogin.cpp: old rule that Boost.Coroutine
header must be #included before anything else that might use ucontext.h is
gone now that we no longer depend on ucontext.h. In fact remove
-D_XOPEN_SOURCE in 00-Common.cmake because that was inserted specifically to
work around a known problem with the ucontext.h facilities.
2013-02-21 01:13:24 -05:00
11d12f1a99
Merge from viewer-beta
2013-02-13 11:30:36 -05:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
af96927099
Fix test failure
2013-01-28 15:41:01 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
c4b070ae00
merge changes for 3.6.5-release
2013-09-09 14:51:34 -04:00
c69f3acef8
Merge LL 3.6.5
2013-09-09 19:07:03 -06:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
fcacf02582
More merge fixing
2013-07-10 08:40:00 -06:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
9177903931
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-04-29 15:39:42 +02:00
Tank_Master