summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-08-19DRTVWR-493: When a test fails due to exception, display exception.Nat Goodspeed
2019-08-16Merged in graham_linden/viewer-eep-g (pull request #478)Graham Madarasz
SL-11589. SL-11212
2019-08-15SL-11662 - apparently a race condition between image loading and material ↵Brad Payne (Vir Linden)
property setting
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-14MergeGraham Linden
2019-08-14Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-13MergeGraham Linden
2019-08-13Merge viewer-release 6.2.5Graham Linden
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-13Added tag 6.2.4-release for changeset 67297f990285Nat Goodspeed
2019-08-13SL-11212Graham Linden
Remove color clamping in determining sun diffuse and moonlight diffuse color from atmo settings.
2019-08-13SL-11212Graham Linden
Calculate sunAngle2 correctly given light dir in new coord space.
2019-08-13SL-11589Graham Linden
Modify altitude blend factor in cloud shaders to fade more aggressively and fix cloud rendering artifacts when at altitude.
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-12Merged in graham_linden/viewer-eep-g (pull request #477)Graham Madarasz
Fix line-endings on new inline file.
2019-08-12Fix line-endings on new inline file.Graham Linden
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-12Merged in graham_linden/viewer-eep-g (pull request #476)Graham Madarasz
SL-10566, SL-11676, SL-11677
2019-08-12SL-10566, SL-10677Graham Linden
Make sky updates only occur if the input atmospherics values have actually changed (perf optimization). Make water rendering use specular color for coloring spec.
2019-08-12SL-11676Graham Linden
Make sun/moon textures render on Low/Low-Mid again. Fix solar additive being present when moon was only heavenly body in sky.
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