summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2019-10-15Merge from viewer-releaseandreykproductengine
2019-10-15increment viewer version to 6.3.3Nat Goodspeed
2019-10-14SL-11719 Fixed init of conversation logandreykproductengine
2019-10-10SL-12093 FIXED [ordered shutdown] conversation.log erased at log in when all ↵maxim_productengine
logs are set to be saved
2019-09-16DRTVWR-493 LLLogChat to singletonandreykproductengine
2019-09-14Backed out changeset: 8e228364f324AndreyL ProductEngine
2019-09-14Backed out changeset: a6398f90389aAndreyL ProductEngine
2019-09-10Downstream merge from lindenlab/viewer-lynxAndreyL ProductEngine
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-09-10increment viewer version to 6.3.2Nat Goodspeed
2019-09-05Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2019-09-05SL-11718 Another exit crashandreykproductengine
2019-09-04SL-11868 Fix cache init after purgeandreykproductengine
2019-09-04SL-11866 [D493] Some startup elements can be executed twice, added protectionsandreykproductengine
2019-09-04SL-11865 Fixed weird existance checkandreykproductengine
2019-09-03SL-11856 Backed out SL-11012AndreyL ProductEngine
changeset: 0d43d9754b79
2019-08-29Merge from lindenlab/viewer-releaseandreykproductengine
2019-08-26Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-26increment viewer version to 6.3.1Nat Goodspeed
2019-08-20Automated merge with ssh://bitbucket.org/andreykproductengine/drtvwr-493Nat Goodspeed
2019-08-15SL-11662 - apparently a race condition between image loading and material ↵Brad Payne (Vir Linden)
property setting
2019-08-14No such thing as 'virtual static'Nat Goodspeed
2019-08-14Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-13mergeBrad Payne (Vir Linden)
2019-08-13Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2019-08-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
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-12Automated merge with ssh://bitbucket.org/andreykproductengine/drtvwr-493Nat Goodspeed
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-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-24no-op change to force build and build number updateBrad Payne (Vir Linden)
2019-07-24SL-10993 Use the Malgun font for Korean on WindowsAndreyL ProductEngine
2019-07-30SL-10639 Line endings fixAndreyL ProductEngine
2019-07-22FIX SL-10639 minor typo in Germaneli
2019-07-16SL-11597 Fix crash on dead objectandreykproductengine
2019-07-15SL-11528 FIXED Object Profile > Details does not show magenta highlight for ↵maxim_productengine
mesh objects