summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2019-08-14Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-13DRTVWR-493 Test fix for W64andreykproductengine
2019-08-13DRTVWR-493 Converted LLViewerParcelMediaAutoPlay to singletonandreykproductengine
2019-08-13DRTVWR-493 Reworked a number of initsandreykproductengine
2019-08-13increment viewer version to 6.2.5Nat Goodspeed
2019-08-13SL-11718 Crash in LLRender2Dandreykproductengine
2019-08-12DRTVWR-493: Rely on recursive_mutex to handle circularityNat Goodspeed
from LLParamSingleton::initSingleton().
2019-08-12Automated merge with ssh://bitbucket.org/andreykproductengine/drtvwr-493Nat Goodspeed
2019-08-12DRTVWR-493: Permit LLParamSingleton::initSingleton() circularity.Nat Goodspeed
This was forbidden, but AndreyK points out cases in which LLParamSingleton:: initSingleton() should in fact be allowed to circle back to its own instance() method. Use a recursive_mutex instead of plain mutex to permit that; remove LL_ERRS preventing it. Add LLParamSingleton::instance() method that calls LLParamSingleton::getInstance(). Inheriting LLSingleton::instance() called LLSingleton::getInstance() -- not at all what we want. Add LLParamSingleton unit tests.
2019-08-12DRTVWR-493 LLWearableType to LLParamSingletonandreykproductengine
2019-08-12Merge from nat_linden/drtvwr-493andreykproductengine
2019-08-12SL-11719 Initialize the conversation dialog on login screen appearance to ↵AndreyL ProductEngine
avoid crash
2019-08-12Automated merge with file:///Users/nat/linden/viewer-catchNat Goodspeed
2019-08-12DRTVWR-493: Streamline LLParamSingleton, LLLockedSingleton.Nat Goodspeed
Simplify LLSingleton::SingletonLifetimeManager to SingletonInitializer: that struct has not been responsible for deletion ever since LLSingletonBase acquired dependency-ordered deleteAll(). Move SingletonData::mInitState changes from SingletonLifetimeManager to constructSingleton() method. Similarly, constructSingleton() now sets SingletonData::mInstance instead of making its caller store the pointer. Add variadic arguments to LLSingleton::constructSingleton() so we can reuse it for LLParamSingleton. Add finishInitializing() method to encapsulate logic reused for getInstance()'s INITIALIZING and DELETED cases. Make LLParamSingleton a subclass of LLSingleton, just as LLLockedSingleton is a subclass of LLParamSingleton. Make LLParamSingleton a friend of LLSingleton, so it can access private members of LLSingleton without also granting access to any DERIVED_CLASS subclass. This eliminates the need for protected getInitState(). LLParamSingleton::initParamSingleton() reuses LLSingleton::constructSingleton() and finishInitializing(). Its getInstance() method completely replaces LLSingleton::getInstance(): in most EInitStates, LLParamSingleton::getInstance() is an error. Use a std::mutex to serialize calls to LLParamSingleton::initParamSingleton() and getInstance(). While LLSingleton::getInstance() relies on the "initialized exactly once" guarantee for block-scope static declarations, LLParamSingleton cannot rely on the same mechanism. LLLockedSingleton is now a very succinct subclass of LLParamSingleton -- they have very similar functionality. Giving the LLSINGLETON() macro variadic arguments eliminates the need for a separate LLPARAMSINGLETON() macro, while continuing to support existing usage.
2019-08-12DRTVWR-493: Make catch_llerrs() a member of WrapLLErrs.Nat Goodspeed
2019-08-12Automated merge with ssh://bitbucket.org/nat_linden/viewer-vs2017Nat Goodspeed
2019-08-11DRTVWR-493 tiny optimizationandreykproductengine
2019-08-10DRTVWR-493: Introduce test catch_what(), catch_llerrs() functions.Nat Goodspeed
Use them in place of awkward try/catch test boilerplate.
2019-08-10DRTVWR-493 LLUI to LLParamSingletonandreykproductengine
2019-08-10DRTVWR-493 LLRender2D init cleanupandreykproductengine
2019-08-10SL-11716 Fixed crash on initializing LLUIAndreyL ProductEngine
2019-07-25DRTVWR-493 LLRender2D to LLParamSingletonandreykproductengine
2019-07-25SL-11649 FIXED [Love Me Render] Mesh links in HUDs do not have highlights ↵maxim_productengine
when selected.
2019-07-25DRTVWR-493 LLImage to LLParamSingletonandreykproductengine
2019-07-15SL-11528 FIXED Object Profile > Details does not show magenta highlight for ↵maxim_productengine
mesh objects
2019-07-12Merged in ruslantproductengine/viewer-cougar-4cr-5 (pull request #59)Ruslan Teliuk
SL-11435 When ALM is enabled, Depth mode shots are broken when snapshot size is set to anything above current window size Approved-by: Simon Linden <simon@lindenlab.com> Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2019-07-11SL-11435 When ALM is enabled, Depth mode shots are broken when snapshot size ↵ruslantproductengine
is set to anything above current window size - fixed bug described in the ticket - fixed bug with UI (when user change the layer type (color/depth))
2019-07-11DRTVWR-493 Cleanup LLSkinningUtilandreykproductengine
2019-07-04DRTVWR-493 Cleaned up unneded inits.andreykproductengine
2019-07-04DRTVWR-493 LLUrlWhiteList to LLSingletonandreykproductengine
2019-07-04SL-11534 FIXED Animated mesh objects aren't highlighted when viewing objects ↵maxim_productengine
owned by users in the 'About Land' floater
2019-07-03DRTVWR-493 LLAvatarNameCache to singletoneandreykproductengine
2019-06-27DRTVWR-493 LLSpellcheck doesn't need separate initandreykproductengine
2019-06-27Backed out changeset: 920a0dbf290a Machine id is needed after singletons dieandreykproductengine
2019-06-26DRTVWR-476: Pass Obj-C++ switch needed for BugsplatMac on Xcode 10.2.Nat Goodspeed
2019-06-24Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-06-24DRTVWR-493 Cleanup LLFirstUseandreykproductengine
2019-06-21DRTVWR-493 LLViewerParcelMedia to singletonandreykproductengine
2019-06-21DRTVWR-493 LLViewerMedia to singletonandreykproductengine
2019-06-20increment viewer version to 6.2.4Nat Goodspeed
2019-06-20DRTVWR-493 LLLocalBitmapMgr to Singletonandreykproductengine
2019-06-20DRTVWR-493 LLHint to singletonandreykproductengine
2019-06-19DRTVWR-493 LLMachineId to singletonandreykproductengine
2019-06-19DRTVWR-493 LLCallDialogManager to singletonandreykproductengine
2019-06-19DRTVWR-493 LLFollowCamMgr to singletonandreykproductengine
2019-06-04SL-11341 Skip storing the previous gamma value on Intel GPUs + more loggingAndreyL ProductEngine
2019-05-31SL-856 (graphics) Animesh shadows flicker on LOD changeruslantproductengine
SL-10644[Render] Bad Shadow flickering with ALM on (probably)
2019-05-23Merged in default (pull request #56)Andrey Lihatskiy
SL-10898[Mac] Camera spins and pulls back when using alt+zoom with mouse Approved-by: Maxim Nikolenko Approved-by: Andrey Lihatskiy
2019-05-21SL-10898[Mac] Camera spins and pulls back when using alt+zoom with mouseruslantproductengine
2019-05-21Merged in lindenlab/viewer-releaseAndreyL ProductEngine