summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2017-03-22remove stray debug messageGlenn Glazer
2017-03-21SL-321 MAINT-7192: add viewer bitness VMM fetch logic to VMP, including HD ↵Glenn Glazer
Graphcis test
2017-03-21pull from V64 gateGlenn Glazer
2017-03-16merge cleanupGlenn Glazer
2017-03-16mergecoyot@coyot-sager-PC
2017-03-16pull from viewer64 gatecoyot@coyot-sager-PC
2017-03-16merge CEF update and fixes from callumOz Linden
2017-03-15Next part of the 'SL-641 Update CEF -> cef-bin -> Dullahan -> ↵callum@lindenlab.com
p64_3p-Dullahan -> media_plugin_cef.cpp to current latest version' puzzle - fix @rpath/@executable paths for macOS
2017-03-14Fixed for MAINT-7201, MAINT-7202, MAINT-7203 (viewer-embeddedd browser ↵Callum Prentice
scheme handler was broken)
2017-03-14SL-641 - Update CEF -> cef-bin -> Dullahan -> p64_3p-Dullahan -> ↵Callum Prentice
media_plugin_cef.cpp to latest versionPull in p64_3p-dullahan that has the cef 2897/chrome 57
2017-03-14Tweak CEF plugin version to include Chrome equivalentCallum Prentice
2017-03-13Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-03-13Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-13Automated merge with tip of viewer-releaseCallum Prentice
2017-03-13increment viewer version to 5.0.4Oz Linden
2017-03-13Automated merge with ssh://bitbucket.org/lindenlab/viewer64-maint-7177Nat Goodspeed
2017-03-13DRTVWR-418: Make LLEventPumps an LLHandleProvider for LLEventPump.Nat Goodspeed
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-13DRTVWR-418: #include "llrefcount.h" : LLTombStone uses LLRefCount.Nat Goodspeed
Apparently we've been getting away so far without this essential #include only by "leakage" from other #includes in existing consumers. <eyeroll/>
2017-03-13DRTVWR-418: Use LLTempBoundListener to manage "mainloop" listener.Nat Goodspeed
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-13SL-644 Add guard to mCount in LLRender.cppCallum Prentice
2017-03-13DRTVWR-418: Ignore logging that requires resurrecting singletons.Nat Goodspeed
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-13DRTVWR-418: Tweak shutdown sequence to avoid resurrecting singletons.Nat Goodspeed
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-12MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default. (Update2: evidently the registry set call is needed on un.init() too
2017-03-11MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default. (Update: call to select registry needs to be inside a function)
2017-03-11Update: (thanks Drake) MAINT-6998 [Project Alex Ivy] 64bit viewer installs ↵callum@lindenlab.com
to Program Files (x86) by default. Added option to engage 32 or 64 bit registry
2017-03-10MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default.
2017-03-10Fix for MAINT-7047 No information about 32bit or 64bit version of 'Project ↵Callum Prentice
Alex Ivy' viewer in non-English locales
2017-03-10SL-321: add new VMP package, fix llbase pathGlenn Glazer
2017-03-09Second part of fix for SL-646 Fix 'LINK : warning LNK4075: ignoring ↵Callum Prentice
/INCREMENTAL due to '/LTCG' specification' in LibVLC, JPEGLIB etc.
2017-03-09SL-321: add local llbase support for WindowsGlenn Glazer
2017-03-08Second Life SL-643 viewer_manifest.py still tried to copy the CEF file ↵callum@lindenlab.com
wow_helper.exe but it's no longer present
2017-03-08SL-321: fix windows pathing, add iconsGlenn Glazer
2017-03-08merge changes for MAINT-7156Oz Linden
2017-03-07SL-321: reintegration of autobuild as package, build changes for linux and ↵Glenn Glazer
windows integration
2017-03-06SL-321: add new ViewerManager.cmake file, knowingly overriding commit hooksGlenn Glazer
2017-03-06SL-321: reintegration of autobuild as package, build changes for mac integrationGlenn Glazer
2017-03-06Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-03-06increment viewer version to 5.0.3Oz Linden
2017-03-06Automated merge with tip of lindenlab/viewer64callum@lindenlab.com
2017-03-03Remove OSX headers added for testing purposes and also some unused varsCallum Prentice
2017-03-03First pass at osx/macos keyboard events - simple case like google homepage ↵callum@lindenlab.com
is working
2017-03-01SL-321: remove redundant const declaration of MD5HEX_STR_SIZE in ↵Glenn Glazer
llversioninfo, remove extraneous python variable assignment in CMakeLists, run tests with INFO
2017-03-01Fix up slight change to Dullahan interface where we call out the platform ↵callum@lindenlab.com
for native keyboard injection to match OSX version
2017-03-01SL-321: fix merge removal of llhasheduniqueid from from llloginstance_test's ↵Glenn Glazer
include path
2017-03-01SL-321: fix merge removal of mIsFirstRun definition, remove pyinstaller from ↵Glenn Glazer
viewer cmake, now in VMP package cmake
2017-03-01MAINT-7161 Crash in LLViewerInventoryItemandreykproductengine
2017-02-28mergecoyot@coyot-sager-PC
2017-02-28pull from rev d22beb597e52ecbf1c98f25d4489ea0425eda4b0 of sl-321coyot@coyot-sager-PC
2017-02-24First round of changes to make the macOS 64 build workcallum@lindenlab.com
2017-02-24MAINT-7156: do not use the server-supplied agent email when sending a ↵Oz Linden
postcard because it is obfuscated and not needed
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-17 04:07:49 +0000