Commit Graph

37276 Commits (d07751e8de8f9d137db07d62b64e6cf22cfaab7b)

Author SHA1 Message Date
Glenn Glazer d07751e8de add version string to ct2 results 2017-03-29 16:42:22 -07:00
Oz Linden 71ffed27c7 remove --quiet from xcodebuild (it hides too much) 2017-03-21 08:03:15 -04:00
Oz Linden 2d921e0063 merge CEF update and fixes from callum 2017-03-16 14:32:12 -04: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
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
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
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
callum@lindenlab.com e6ed0b0ae7 Second Life SL-643 viewer_manifest.py still tried to copy the CEF file wow_helper.exe but it's no longer present 2017-03-08 14:29:02 -08:00
Oz Linden d6cd9d0771 merge changes for MAINT-7156 2017-03-08 15:32:05 -05:00
callum@lindenlab.com f8f2826156 Pull in updated p64_3p-dullahan with fix for help app icon appearing in dock 2017-03-06 16:00:24 -08:00
Nat Goodspeed 1771857e6c Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-03-06 14:27:29 -05:00
Oz Linden 08ed7f676f increment viewer version to 5.0.3 2017-03-06 14:25:25 -05:00
Oz Linden 885343edef Added tag 5.0.2-release for changeset cea1632c002c 2017-03-06 14:25:25 -05:00
callum@lindenlab.com bfdbda24bf Automated merge with tip of lindenlab/viewer64 2017-03-06 11:02:07 -08:00
Callum Prentice 9e00fe430d Automated merge with head 2017-03-03 17:45:33 -08:00
Callum Prentice 7d1942a2b6 Remove OSX headers added for testing purposes and also some unused vars 2017-03-03 17:45:09 -08:00
callum@lindenlab.com d056ce451b Pull in new version of p64_3p-dullahan with fix for missing OSX function and warnings 2017-03-03 16:41:11 -08:00
callum@lindenlab.com 398c351371 First pass at osx/macos keyboard events - simple case like google homepage is working 2017-03-03 15:32:47 -08:00
callum@lindenlab.com f49033efcf Fix up slight change to Dullahan interface where we call out the platform for native keyboard injection to match OSX version 2017-03-01 16:43:15 -08:00
callum@lindenlab.com 1243e41670 Pull in new p64_3p-dullahan with osx keyboard input changes 2017-03-01 16:42:21 -08:00
andreykproductengine 535f5c5120 MAINT-7161 Crash in LLViewerInventoryItem 2017-03-01 19:26:26 +02:00
callum@lindenlab.com 08940da90e First round of changes to make the macOS 64 build work 2017-02-24 15:44:36 -08:00
Oz Linden 94c2ebdea4 MAINT-7156: do not use the server-supplied agent email when sending a postcard because it is obfuscated and not needed 2017-02-24 14:20:48 -05:00
callum@lindenlab.com bff83a7f41 Whoopps. Apologies for leaving Windows debug spam in code :( 2017-02-23 10:26:46 -08:00
callum@lindenlab.com f04bfdd70e Update media plugin CEF code to match new Dullahan 2017-02-23 10:17:52 -08:00
callum@lindenlab.com 210e2a8bfb Pull in latest 3P Dullahan with change to cursor changed function signature 2017-02-23 10:16:47 -08:00
Callum Prentice 8f4cb2bc15 Use new version info from CEF plugin to display in About box 2017-02-22 19:22:15 -08:00
Callum Prentice 2c8299d643 reenable support for copy/cut/paste to/from a web page 2017-02-22 19:21:55 -08:00
Callum Prentice ea4ef0b4e0 Pull in new version of p64_3p-Dullahan with support for flippyingh pixels/mouse, copy/cut/paste and new version info 2017-02-22 19:21:01 -08:00
Oz Linden f0b256b1cb correct merge error in BuildVersion.cmake 2017-02-22 17:34:46 -05:00