summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2017-03-22Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2017-03-21MAINT-7224 Chat logs move down, leaving huge empty spaceMnikolenko Productengine
2017-03-20Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-03-21MAINT-6789 Add More now won't affect Edit Appearance perfomance during fetch ↵andreykproductengine
unless visible
2017-03-22MAINT-7225 MAC build fixandreykproductengine
2017-03-22MAINT-6404 FIXED When pasting from Mac Word into a notecard, line break is ↵Mnikolenko Productengine
replaced by ?
2017-03-20MAINT-7223 Odd placement on box in chat preferencesMnikolenko Productengine
2017-03-20MAINT-7117 Don't Show "Unknown error" in warning dialogMnikolenko Productengine
2017-03-17Readd the depricated way of updating the estate info. TODO: Figure out why ↵Rider Linden
the cap is not working.
2017-03-16merge CEF update and fixes from callumOz Linden
2017-03-16MAINT-1858 Fixed camera not looking at avatar if "Editing Appearance" while ↵andreykproductengine
moving
2017-03-17MAINT-7215 Add "+" button next to filter editor in Avatar rendering settings ↵Mnikolenko Productengine
floater
2017-03-16MAINT-7208 Some messages had links that were not highlightedandreykproductengine
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-15Merged in MAINT-7168max nikolenko
2017-03-15MAINT-7199 Field "From" on the tab "Send via E-mail" should be initialized ↵Mnikolenko Productengine
to the agent full name
2017-03-15MAINT-7168 Avatar rendering settings adjustmentsMnikolenko Productengine
2017-03-15MAINT-7206 Fixed crash on doubleclick deselecting last mute type from the ↵AndreyL ProductEngine
context menu
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-14MAINT-1800 Menu item appears at the top of the screen during teleportingandreykproductengine
2017-03-14Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-03-13Backed out changeset: 87661f6ec809Rider Linden
2017-03-13MAINT-7196: Revers flag when sent to viewer (to correctly mask when value ↵Rider Linden
isn't sent)
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-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
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-13MAINT-1324 Warning should appear that objects in different regions can't be ↵andreykproductengine
linked
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-11MAINT-6789 bulk update can be resource hungry and needs to be monitoredandreykproductengine
2017-03-10MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) ↵Callum Prentice
by default.
2017-03-10MAINT-7196: Viewer changes supporting new Allow Access Override opition for ↵Rider Linden
estate owners.
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-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-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-08merge changes for MAINT-7156Oz Linden
2017-03-06Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2017-03-06Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed