Commit Graph

37362 Commits (6c8f447e529d4ea8ac70cc4ede4749f0b9f9bdaf)

Author SHA1 Message Date
coyot@coyot-sager-PC 6c8f447e52 SL-323: activate viewer menu and floater checks for updates via VMP 2016-11-02 18:05:32 +01:00
Glenn Glazer c417b2637a SL-323: cherry pick menu changes lost in v64 merge, viewer-management-process-sl-321 rev 36267 2017-03-29 13:13:26 -07:00
Glenn Glazer 94924e4bc5 dummy commit to bump build (pyinstaller dev tip now in both 32 and 64) 2017-03-29 11:45:28 -07:00
Glenn Glazer bf121a1e55 dummy commit to bump build 2017-03-29 08:25:46 -07:00
Glenn Glazer 7ad8cd7979 dummy commit to bump build 2017-03-28 09:40:29 -07:00
Glenn Glazer d320d35017 SL-321: upgrade VMP package 503733 2017-03-24 13:32:57 -07:00
Glenn Glazer 7107eb8db4 remove stray debug message 2017-03-22 14:52:30 -07:00
Glenn Glazer 59a4eacb42 SL-321: upgrade to VMP package 503622 2017-03-22 12:13:36 -07:00
Glenn Glazer 43f5297dfa update VMP package 503633 2017-03-21 14:48:45 -07:00
Glenn Glazer 5cb3473857 SL-321 MAINT-7192: add viewer bitness VMM fetch logic to VMP, including HD Graphcis test 2017-03-21 13:58:22 -07:00
Glenn Glazer f9a7960d18 update VMP package 503604 2017-03-21 07:43:36 -07:00
Glenn Glazer 0f245dea04 pull from V64 gate 2017-03-21 07:10:11 -07:00
Oz Linden 71ffed27c7 remove --quiet from xcodebuild (it hides too much) 2017-03-21 08:03:15 -04:00
Glenn Glazer 4992654682 merge cleanup 2017-03-16 15:45:52 -07:00
coyot@coyot-sager-PC 664e4b4466 merge 2017-03-16 22:54:27 +01:00
coyot@coyot-sager-PC fc56311ebf pull from viewer64 gate 2017-03-16 22:21:49 +01:00
Oz Linden 2d921e0063 merge CEF update and fixes from callum 2017-03-16 14:32:12 -04:00
Glenn Glazer ed5fda3271 SL-321: add new VMP package 50513 2017-03-15 18:49:24 -07:00
callum@lindenlab.com bdecc9cce9 Next part of the 'SL-641 Update CEF -> cef-bin -> Dullahan -> p64_3p-Dullahan -> media_plugin_cef.cpp to current latest version' puzzle - fix @rpath/@executable paths for macOS 2017-03-15 16:33:51 -07:00
Glenn Glazer 455412c395 SL-321: add new VMP package 503461 2017-03-15 09:41:13 -07:00
Glenn Glazer ca9935f130 SL-321: add new VMP package 503417 2017-03-14 20:49:33 -07:00
Glenn Glazer 96790c8056 SL-321: add new VMP package 503410 2017-03-14 17:40:23 -07:00
Glenn Glazer 07ef9137c8 SL-321: add new VMP package 2017-03-14 15:36:20 -07:00
Callum Prentice f0b5a263c1 Fixed for MAINT-7201, MAINT-7202, MAINT-7203 (viewer-embeddedd browser scheme handler was broken) 2017-03-14 15:28:56 -07:00
Callum Prentice c1f7c00869 SL-641 - Update CEF -> cef-bin -> Dullahan -> p64_3p-Dullahan -> media_plugin_cef.cpp to latest versionPull in p64_3p-dullahan that has the cef 2897/chrome 57 2017-03-14 12:40:25 -07:00
Callum Prentice 062c345556 Tweak CEF plugin version to include Chrome equivalent 2017-03-14 12:37:52 -07:00
Glenn Glazer 3052fa4241 SL-361: update VMP package 2017-03-13 23:26:15 -07:00
Glenn Glazer faa36236ed SL-361: update VMP package 2017-03-13 20:23:31 -07:00
Nat Goodspeed d7f5122ee9 Automated merge with ssh://bitbucket.org/lindenlab/viewer64 2017-03-13 16:41:35 -04:00
Nat Goodspeed 66de0c9965 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-03-13 16:38:00 -04:00
Callum Prentice 9783350026 Automated merge with tip of viewer-release 2017-03-13 13:16:26 -07:00
Oz Linden 49e114748f increment viewer version to 5.0.4 2017-03-13 15:34:01 -04:00
Oz Linden 51a4af93b2 Added tag 5.0.3-release for changeset 02c24e9f4f7d 2017-03-13 15:34:01 -04:00
Nat Goodspeed a160e084af Automated merge with ssh://bitbucket.org/lindenlab/viewer64-maint-7177 2017-03-13 15:03:57 -04:00
Nat Goodspeed c1458713de DRTVWR-418: Make LLEventPumps an LLHandleProvider for LLEventPump.
LLEventPump's destructor was using LLEventPumps::instance() to unregister the
LLEventPump instance from LLEventPumps. Evidently, though, there are lingering
LLEventPump instances that persist even after the LLSingletonBase::deleteAll()
call destroys the LLEventPumps LLSingleton instance. These were resurrecting
LLEventPumps -- pointlessly, since a newly-resurrected LLEventPumps instance
can have no knowledge of the LLEventPump instance! Unregistering is
unnecessary!

What we want is a reference we can bind into each LLEventPump instance that
allows us to safely test whether the LLEventPumps instance still exists.
LLHandle is exactly that. Make LLEventPumps an LLHandleProvider and bind its
LLHandle in each LLEventPump's constructor; then the destructor can unregister
only when LLEventPumps still exists.
2017-03-13 14:31:38 -04:00
Nat Goodspeed e6fc3528fd DRTVWR-418: #include "llrefcount.h" : LLTombStone uses LLRefCount.
Apparently we've been getting away so far without this essential #include only
by "leakage" from other #includes in existing consumers. <eyeroll/>
2017-03-13 14:22:19 -04:00
Nat Goodspeed a33c5930cb DRTVWR-418: Use LLTempBoundListener to manage "mainloop" listener.
LLUpdaterServiceImpl binds its onMainLoop() listener method to the "mainloop"
event so it can wake up periodically to recheck for updates. (Suggests maybe a
smarter conventional callback-on-timer facility with a central queue, instead
of every interested party intercepting *every* frame...)

~LLUpdaterServiceImpl() was calling LLEventPumps::instance() only to
disconnect that listener, which was resurrecting the deleted LLEventPumps
instance. Instead store an LLTempBoundListener in LLUpdaterServiceImpl, the
conventional way to implicitly disconnect on destroy. Use its disconnect()
method when explicit disconnection is desired.
2017-03-13 14:19:50 -04:00
Callum Prentice 7c5e92cec5 SL-644 Add guard to mCount in LLRender.cpp 2017-03-13 11:13:43 -07:00
Nat Goodspeed 1a8c8df686 DRTVWR-418: Ignore logging that requires resurrecting singletons.
The logging subsystem depends on two different LLSingletons for some reason.
It turns out to be very difficult to completely avoid executing any logging
calls after the LLSingletonBase::deleteAll(), but we really don't want to
resurrect those LLSingletons so late in the run for a couple stragglers.
Introduce LLSingleton::wasDeleted() query method, and use it in logging
subsystem to simply bypass last-millisecond logging requests.
2017-03-13 14:09:14 -04:00
Nat Goodspeed 04c3f2b0f0 DRTVWR-418: Tweak shutdown sequence to avoid resurrecting singletons.
The LLSingletonBase::deleteAll() call late in LLAppViewer::cleanup() deletes
the LLSingleton(s) used by the logging machinery, among other things. Attempting
further logging after that call (such as our cheery "Goodbye!") has the
unfortunate effect of attempting to resurrect the deleted LLSingleton(s). Move
"Goodbye!" to just *before* the call.

Also, given that call, the manual references to a couple specific LLSingletons
in ~LLAppViewer() are (a) unnecessary and (b) cause attempted resurrection.
Eliminate both.
2017-03-13 13:58:59 -04:00
Callum Prentice 17c8eadb3d MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. (Update2: evidently the registry set call is needed on un.init() too 2017-03-12 10:09:34 -07:00
Callum Prentice 656457e79b MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. (Update: call to select registry needs to be inside a function) 2017-03-11 18:01:43 -08:00
callum@lindenlab.com 1053c5ca40 Update: (thanks Drake) MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. Added option to engage 32 or 64 bit registry 2017-03-11 16:15:37 -08:00
Callum Prentice 10bcd510b5 MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. 2017-03-10 15:11:44 -08:00
Callum Prentice 39ebb2d093 Fix for MAINT-7047 No information about 32bit or 64bit version of 'Project Alex Ivy' viewer in non-English locales 2017-03-10 12:20:13 -08:00
Glenn Glazer 8cbaaa364f SL-321: add new VMP package, fix llbase path 2017-03-10 09:23:35 -08:00
callum@lindenlab.com d1ef2a7291 Fix for SL-658 Use build settings from viewer-build-variables repo for p64_3p-dullahan 2017-03-09 17:16:21 -08:00
Callum Prentice 884a59a2fb Second part of fix for SL-646 Fix 'LINK : warning LNK4075: ignoring /INCREMENTAL due to '/LTCG' specification' in LibVLC, JPEGLIB etc. 2017-03-09 14:08:09 -08:00
callum@lindenlab.com fb85514cc8 Pull in 3rd party lib to fix: SL-646 ”LINK : warning LNK4075: ignoring '/INCREMENTAL' due to '/LTCG' specification” in LibVLC, JPEGLIB etc. 2017-03-09 12:17:14 -08:00
Glenn Glazer 2e01122575 SL-321: add local llbase support for Windows 2017-03-09 10:28:16 -08:00