summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-09-25Automated merge with ssh://bitbucket.org/lindenlabinternal/viewer-xcode11Nat Goodspeed
2019-09-25Disabled broken automatic code signing for local development when using Xcode 11Brad Kittenbrink
2019-09-24Automated merge with ssh://bitbucket.org/lindenlab/viewer-vs2017Nat Goodspeed
2019-09-17update to SLVoice version 4.9.0002.32137.3410b595.531025Oz Linden
2019-09-17SL-11917 Updated VVMandreykproductengine
2019-09-16DRTVWR-493 LLLogChat to singletonandreykproductengine
2019-09-14Backed out changeset: 8e228364f324AndreyL ProductEngine
2019-09-14Backed out changeset: b4182ee25942AndreyL ProductEngine
2019-09-14Backed out changeset: 4273d752fb17AndreyL ProductEngine
2019-09-14Backed out changeset: a6398f90389aAndreyL ProductEngine
2019-09-14Backed out changeset: 4a7dac768faeAndreyL ProductEngine
2019-09-14Backed out changeset: 20da15768791AndreyL ProductEngine
2019-09-14Backed out changeset: 8da237b54852AndreyL ProductEngine
2019-09-14Backed out changeset: 122dc88276c7AndreyL ProductEngine
2019-09-14SL-11536 Backed out CEF update (changeset: c246ab81b298)AndreyL ProductEngine
2019-09-13correct Mac SLVoice executable nameOz Linden
2019-09-13update Mac slvoice buildOz Linden
2019-09-10Downstream merge from lindenlab/viewer-bearAndreyL ProductEngine
2019-09-10Downstream merge from lindenlab/viewer-lynxAndreyL ProductEngine
2019-09-10Merged in lindenlab/viewer-releaseandreykproductengine
2019-09-10increment viewer version to 6.3.2Nat Goodspeed
2019-09-10Added tag 6.3.1-release for changeset ece699718f16Nat Goodspeed
2019-09-06handle slvoice executable separately from the vivox libraries, and update ↵Oz Linden
mac slvoice package
2019-09-05Merged in lindenlab/viewer-bearAndreyL ProductEngine
2019-09-05Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2019-09-05SL-11718 Another exit crashandreykproductengine
2019-09-04DRTVWR-493 Do not recreate proxy only to destroy itandreykproductengine
2019-09-04SL-11868 Fix cache init after purgeandreykproductengine
2019-09-04SL-11866 [D493] Some startup elements can be executed twice, added protectionsandreykproductengine
2019-09-04SL-11865 Fixed weird existance checkandreykproductengine
2019-09-03SL-11856 Backed out SL-11012AndreyL ProductEngine
changeset: 0d43d9754b79
2019-08-29SL-11657 Further improvementsandreykproductengine
2019-08-29Merge from lindenlab/viewer-releaseandreykproductengine
2019-08-26Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-08-26increment viewer version to 6.3.1Nat Goodspeed
2019-08-26Added tag 6.3.0-release for changeset 9777aec6dc4aNat Goodspeed
2019-08-20Automated merge with ssh://bitbucket.org/andreykproductengine/drtvwr-493Nat Goodspeed
2019-08-20DRTVWR-493: Clarify capturing LLError::getFatalFunction() in a var.Nat Goodspeed
VS 2013 thought we were storing an initialization-list.
2019-08-20DRTVWR-493: Defend LL[Param]Singleton against ctor/init exceptions.Nat Goodspeed
An exception in the LLSingleton subclass constructor, or in its initSingleton() method, could leave the LLSingleton machinery in a bad state: the failing instance would remain in the MasterList, also on the stack of initializing LLSingletons. Catch exceptions in either and perform relevant cleanup. This problem is highlighted by test programs, in which LL_ERRS throws an exception rather than crashing the whole process. In the relevant catch clauses, clean up the initializing stack BEFORE logging. Otherwise we get tangled up recording bogus dependencies. Move capture_dependency() out of finishInitializing(): it must be called by every valid getInstance() call, both from LLSingleton and LLParamSingleton. Introduce new CONSTRUCTED EInitState value to distinguish "have called the constructor but not yet the initSingleton() method" from "currently within initSingleton() method." This is transient, but we execute the 'switch' on state within that moment. One could argue that the previous enum used INITIALIZING for current CONSTRUCTED, and INITIALIZED meant INITIALIZING too, but this is clearer. Introduce template LLSingletonBase::classname() helper methods to clarify verbose demangle(typeid(stuff).name()) calls. Similarly, introduce LLSingleton::pop_initializing() shorthand method.
2019-08-19DRTVWR-493: Improve exception safety of LLSingleton initialization.Nat Goodspeed
Add try/catch clauses to constructSingleton() (to catch exceptions in the subclass constructor) and finishInitializing() (to catch exceptions in the subclass initSingleton() method). Each of these catch clauses rethrows the exception -- they're for cleanup, not for ultimate handling. Introduce LLSingletonBase::reset_initializing(list_t::size_t). The idea is that since we can't know whether the exception happened before or after the push_initializing() call in LLSingletonBase's constructor, we can't just pop the stack. Instead, constructSingleton() captures the stack size before attempting to construct the new LLSingleton subclass. On exception, it calls reset_initializing() to restore the stack to that size. Naturally that requires a corresponding LLSingleton_manage_master method, whose MasterList specialization is a no-op. finishInitializing()'s exception handling is a bit simpler because it has a constructed LLSingleton subclass instance in hand, therefore push_initializing() has definitely been called, therefore it can call pop_initializing(). Break out new static capture_dependency() method from finishInitializing() because, in the previous LLSingleton::getInstance() implementation, the logic now wrapped in capture_dependency() was reached even in the INITIALIZED case. TODO: Add a new EInitState to differentiate "have been constructed, now calling initSingleton()" from "fully initialized, normal case" -- in the latter control path we should not be calling capture_dependency(). The LLSingleton_manage_master<LLSingletonBase::MasterList> specialization's get_initializing() function (which called get_initializing_from()) was potentially dangerous. get_initializing() is called by push_initializing(), which (in the general case) is called by LLSingletonBase's constructor. If somehow the MasterList's LLSingletonBase constructor ended up calling get_initializing(), it would have called get_initializing_from(), passing an LLSingletonBase which had not yet been constructed into the MasterList. In particular, its mInitializing map would not yet have been initialized at all. Since the MasterList must not, by design, depend on any other LLSingletons, LLSingleton_manage_master<LLSingletonBase::MasterList>::get_initializing() need not return a list from the official mInitializing map anyway. It can, and should, and now does, return a static dummy list. That obviates get_initializing_from(), which is removed. That in turn means we no longer need to pass get_initializing() an LLSingletonBase*. Remove that parameter.
2019-08-19DRTVWR-493: When a test fails due to exception, display exception.Nat Goodspeed
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-14Merged in lindenlab/viewer-releaseandreykproductengine
2019-08-13mergeBrad Payne (Vir Linden)
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 04:18:47 +0000