summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2019-08-27Merge fixAnsariel
2019-08-27Merged in graham_linden/viewer-eep-g (pull request #486)Graham Madarasz
Default
2019-08-27Move decl of statics inside func to appease Clang, maybe.Graham Linden
2019-08-26Make texture ctrl visibility set respect BOOL vs bool and use better naming.Graham Linden
2019-08-26SL-11706: Correctly load settings when pushing the Load button in the fixed ↵Rider Linden
environment editor.
2019-08-26Fix merged code use of obsoleted vars and other merge errors.Graham Linden
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-26Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-26increment viewer version to 6.3.1Nat Goodspeed
2019-08-26MergeRider Linden
2019-08-26SL-11705, SL-11706: New flags in llsettings base for tracking by simulator.Rider Linden
2019-08-23SL-11778Graham Linden
Make RenderShadowResolutionScale work again, also decoupling shadow buffer alloc/release/resize from screen buffer resize function.
2019-08-23SL-11774Graham Linden
Fix diffuse boost when water fog is enabled and make deferred underwater shader participate in EEP/WL param updates by marking it as a water shader.
2019-08-23Remove unused vars to appease Clang.Graham Linden
2019-08-22Best of both worlds for 11776.Graham Linden
2019-08-22SL-11776Graham Linden
Merge both solutions preserving the simpler of the two. Will revisit to catch the new code for timeslicing updates once it is debugged.
2019-08-22SL-11776 Fixed moon's comparison conditionandreykproductengine
2019-08-22SL-11776Graham Linden
Fix false alarming sky updates and doing expensive CPU work for same sky pixels.
2019-08-22SL-11406Graham Linden
Restore code to stomp emissive in the absence of a normal map (to avoid fullbright implying full emissive).
2019-08-22SL-11776 Compensate freeze by spreading calculationsandreykproductengine
2019-08-22SL-11779Graham Linden
Make changing shadow res scale not instantly drop/realloc buffers but wait until display gets to it.
2019-08-20Automated merge with ssh://bitbucket.org/andreykproductengine/drtvwr-493Nat 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-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-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-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-12Automated merge with ssh://bitbucket.org/andreykproductengine/drtvwr-493Nat Goodspeed
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.