summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2019-08-14DRTVWR-493: Work around static initialization order problem.Nat Goodspeed
LLParamSingleton contained a static member mutex. Unfortunately that wasn't guaranteed to be initialized by the time its getInstance() was entered. Use a function-local static instead.
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-servalAndreyL ProductEngine
2019-08-13Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-08-13Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2019-08-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
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-13SL-11707 FIXED [Maint] Incorrect sound length limit referenced.maxim_productengine
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-08-09SL-9699 Login selectionandreykproductengine
2019-08-19SL-11692 FIXED The "Walk / run / fly..." menu item is not checked when in usemaxim_productengine
2019-08-19SL-11749 FIXED Show in search grayed out at 128m minimummaxim_productengine
2019-08-16SL-11740 FIXED Wrong entries in conversation.log for groups with | in the namemaxim_productengine
2019-08-15SL-209 Cleanup Merchant Outboxandreykproductengine
2019-08-14SL-11674 Update bulk upload warningmaxim_productengine
2019-08-06SL-9815 An error prompts the user to teleport when they have no credencials setandreykproductengine
2019-08-06SL-10908 Test viewers should crash normallyandreykproductengine
2019-08-05SL-10908 One more safeguardandreykproductengine
2019-07-31SL-11657 Separated expected from current inventory serial for better sync ↵andreykproductengine
and to fix partial loads
2019-08-01SL-7628 Camera doesn't follow avatar, while avatar is sitting on physical objectandreykproductengine
2019-08-01SL-11666 Fixed the search menu button being over Linden dollar balanceandreykproductengine
2019-07-30SL-11651 Add 'whole word only' search and 'multi-partial name' search to ↵maxim_productengine
Inventory Filter
2019-07-29SL-10047 Confusing language for Russian error message translationandreykproductengine
2019-07-29SL-9189 Add ability to rename gesture in Gesture listmaxim_productengine
2019-07-26SL-8380 Ability to disable 2D UI tooltipsandreykproductengine
2019-07-25DRTVWR-493 LLRender2D to LLParamSingletonandreykproductengine
2019-07-25SL-10962 Support for suppressing JavaScript dialogs in the media plugin codeAndreyL ProductEngine
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)