summaryrefslogtreecommitdiff
path: root/indra/llui
AgeCommit message (Collapse)Author
2020-05-04Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-04-20Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
# Conflicts: # indra/newview/pipeline.cpp
2020-03-18Merge master (v 6.3.9) into DRTVWR-440Dave Houlton
2020-03-18Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-03-18Merge branch 'master' into DRTVWR-500Andrey Lihatskiy
2020-02-25SL-12591 Fixed slider value comparisonAndrey Kleshchev
2020-02-05Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-02-03Merge branch 'DRTVWR-499' into DRTVWR-500Andrey Lihatskiy
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-28Merge branch 'master' of https://bitbucket.org/lindenlab/viewer-private into ↵Brad Payne (Vir Linden)
DRTVWR-481 Merge
2020-01-20SL-12595 The checkbox overlaps buttons in the 'Delete selected item?' ↵andreykproductengine
notification
2020-01-02SL-12484 EXP-696 Remade "Remember Password" checkbox to be multilineandreykproductengine
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-16mergeBrad Payne (Vir Linden)
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-27Downstream merge from lindenlab/viewer-lynxAndreyL ProductEngine
2019-11-22SL-12100 Premium Enhancements - Changes to rates to create Groups, UI Workandreykproductengine
2019-11-22SL-12317 UI Changes to Group limitsmaxim_productengine
2019-11-14Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-11-12BuildfixAndreyL ProductEngine
2019-11-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-31Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-10-23MAC build fixandreykproductengine
2019-10-16mergeBrad Payne (Vir Linden)
2019-10-15Merge from viewer-releaseandreykproductengine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10SL-11910 [Win] Horizontal scrollandreykproductengine
2019-09-05SL-11315 Viewer asks to play media and retains selected choiceandreykproductengine
2019-08-30SL-1171 [Dev tools] UI controls <-> settings connection issuesandreykproductengine
2019-08-14Merge viewer-release 6.2.5Graham Linden
2019-08-14Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-13Merge viewer-release 6.2.5Graham Linden
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-10DRTVWR-493 LLUI to LLParamSingletonandreykproductengine
2019-08-10DRTVWR-493 LLRender2D init cleanupandreykproductengine
2019-07-26SL-8380 Ability to disable 2D UI tooltipsandreykproductengine
2019-07-25DRTVWR-493 LLRender2D to LLParamSingletonandreykproductengine
2019-07-05SL-11551 tilia-inc.com as an official Linden Lab URL should have SL iconmaxim_productengine
2019-06-27DRTVWR-493 LLSpellcheck doesn't need separate initandreykproductengine
2019-06-14SL-11425 FIXED [EEP] Wave vectors cross all over the Water tab if key frame ↵maxim_productengine
is not selected.
2019-06-03SL-10423 Dump path data when missing critical fileandreykproductengine
2019-05-29Merge releaseGraham Linden
2019-05-23Merged in default (pull request #56)Andrey Lihatskiy
SL-10898[Mac] Camera spins and pulls back when using alt+zoom with mouse Approved-by: Maxim Nikolenko Approved-by: Andrey Lihatskiy
2019-05-21SL-10898[Mac] Camera spins and pulls back when using alt+zoom with mouseruslantproductengine
2019-05-21SL-10898[Mac] Camera spins and pulls back when using alt+zoom with mouseruslantproductengine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 14:03:41 +0000