summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-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-12Automated merge with ssh://bitbucket.org/nat_linden/viewer-vs2017Nat Goodspeed
2019-08-11DRTVWR-493 tiny optimizationandreykproductengine
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-25DRTVWR-493 LLImage to LLParamSingletonandreykproductengine
2019-07-11DRTVWR-493 Cleanup LLSkinningUtilandreykproductengine
2019-07-04DRTVWR-493 Cleaned up unneded inits.andreykproductengine
2019-07-04DRTVWR-493 LLUrlWhiteList to LLSingletonandreykproductengine
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-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-05-21increment viewer version to 6.2.3Nat Goodspeed
2019-05-17Pull from viewer-bear and mergeSteven Harrison (steven)
2019-05-17SL-11213 No longer embedding the channel in the viewer release note urls. ↵Steven Harrison (steven)
Update base URLs to match new viewer release note URL
2019-05-14Mac buildfixAndreyL ProductEngine
2019-05-07increment viewer version to 6.2.2Nat Goodspeed
2019-04-30Fix spurious assert from using highlights without binding highlight shader.Graham Linden
Only affects devs, but could have downstream consequences for rendering.
2019-04-26Merged SL-10400 and SL-10401AndreyL ProductEngine
2019-04-26SL-10400 - more on group limits from SimulatorFeaturesBrad Payne (Vir Linden)
2019-04-25SL-10400 - get group limits from SimulatorFeaturesBrad Payne (Vir Linden)
2019-04-23via viewer-neko - don't crash test viewer due to missing version checkerBrad Payne (Vir Linden)
2019-04-23SL-10401 - get agent attachment limit from SimulatorFeatures if availableBrad Payne (Vir Linden)
2019-04-17Merged in lindenlab/viewer-release (EAM)AndreyL ProductEngine
2019-04-17increment viewer version to 6.2.1Nat Goodspeed
2019-04-15FIX INTL-336 Viewer translation for 9 languages (Set 56) for viewer-beareli
2019-04-11SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100%AndreyL ProductEngine
2019-04-06SL-10891 residuesAndreyL ProductEngine
2019-04-06SL-10891 Reset UI scale factor on first run if OS's display scaling is not 100%AndreyL ProductEngine
2019-04-06Backed out changeset: a2983d6277f2AndreyL ProductEngine
2019-04-05SL-10891 Removed scaling to system UI size on WindowsAndreyL ProductEngine
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-02Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-04-02increment viewer version to 6.1.2Nat Goodspeed
2019-03-22SL-10780 FIXED Speaker icon is shown for all friendsmaxim_productengine
2019-03-20Backed out changeset: 29f763ea2f9bAndreyL ProductEngine
The fix caused SL-10357
2019-03-14Merged in callum_linden/viewer-release-cve-2019-5786AndreyL ProductEngine