summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Collapse)Author
2018-03-07Fix for calculating azimuth and angleRider Linden
2018-03-06Remove override keyword not working with LL_SINGLETON pattern.Graham Linden graham@lindenlab.com
2018-03-06MergeGraham Linden graham@lindenlab.com
2018-03-06Settings type inventory objects and upload the assests.Rider Linden
2018-03-06Isolate atmospherics LLSD conversion code.Graham Linden graham@lindenlab.com
Fix translateLegacySettings to add an array where an array is expected.
2018-03-03Remove MSVC pragmas breaking OSX build.Graham Linden graham@lindenlab.com
2018-03-03Fix 16F enum for compat w/ SL gl headers on Mac.Graham Linden graham@lindenlab.com
Make density profile/layer parsing handle when LLSD heard you liked arrays so it put an array in your array.
2018-03-02Replace ifdefs with comments marking legacy atmo params.Graham Linden graham@lindenlab.com
2018-03-02Rework density profile validation, eliminate custom ↵Graham Linden graham@lindenlab.com
LLSettingsSky::settingsValidation in favor of custom validator functor for each profile type (rayleigh, mie, absorption).
2018-02-28Fix accidental dups/deletes from merge and remove optimize pragmas.Graham Linden graham@lindenlab.com
2018-02-28MergeGraham Linden graham@lindenlab.com
2018-02-28MergeGraham Linden graham@lindenlab.com
2018-02-28Add 3p package for adv atmospherics to autobuild.Graham Linden graham@lindenlab.com
Mark legacy atmospherics code with ifdefs. Fix up legacy uplift to include new atmospherics settings.
2018-02-27More missing 'override'sRider Linden
2018-02-27Need to bring the mac in...Rider Linden
2018-02-27Missed two overrides.Rider Linden
2018-02-27XCode now gets cranky about override (or lack there of)Rider Linden
2018-02-26Added settings inventory object with subtypeRider Linden
2018-02-22Add settings/validations for new advanced atmo settings.Graham Linden graham@lindenlab.com
2018-02-09Update a couple constructsRider Linden
2018-02-06boost->std & same level interpRider Linden
2018-02-05Transitions between skys. 1Rider Linden
2018-01-30Unused function in llsettingsdaycycleRider Linden
2018-01-30Cleanup on daycyle selection and stack. Move blenders into environment.Rider Linden
(Transition bronken, instant only. Shaddows moved based on region, not parcel)
2018-01-25Selects correct day cycle. Fix an error validating legacy daycycles.Rider Linden
2018-01-23MAINT-8052: One more step towards parcel environments.Rider Linden
2018-01-23MAINT-8052: Initial support for new EEP capRider Linden
2018-01-16MAINT-8052: Report if the returned environment is the default.Rider Linden
2018-01-08MAINT-7699: Deliver new settings to viewer via capRider Linden
2017-11-30Split for viewer/simhost sync LLSD with simhost.Rider Linden
2017-09-19Baseline for settings changesRider Linden
2017-03-10MAINT-7196: Viewer changes supporting new Allow Access Override opition for ↵Rider Linden
estate owners.
2016-09-15MAINT-5232: Normalize LLSingleton subclasses.Nat Goodspeed
A shocking number of LLSingleton subclasses had public constructors -- and in several instances, were being explicitly instantiated independently of the LLSingleton machinery. This breaks the new LLSingleton dependency-tracking machinery. It seems only fair that if you say you want an LLSingleton, there should only be ONE INSTANCE! Introduce LLSINGLETON() and LLSINGLETON_EMPTY_CTOR() macros. These handle the friend class LLSingleton<whatevah>; and explicitly declare a private nullary constructor. To try to enforce the LLSINGLETON() convention, introduce a new pure virtual LLSingleton method you_must_use_LLSINGLETON_macro() which is, as you might suspect, defined by the macro. If you declare an LLSingleton subclass without using LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() in the class body, you can't instantiate the subclass for lack of a you_must_use_LLSINGLETON_macro() implementation -- which will hopefully remind the coder. Trawl through ALL LLSingleton subclass definitions, sprinkling in LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() as appropriate. Remove all explicit constructor declarations, public or private, along with relevant 'friend class LLSingleton<myself>' declarations. Where destructors are declared, move them into private section as well. Where the constructor was inline but nontrivial, move out of class body. Fix several LLSingleton abuses revealed by making ctors/dtors private: LLGlobalEconomy was both an LLSingleton and the base class for LLRegionEconomy, a non-LLSingleton. (Therefore every LLRegionEconomy instance contained another instance of the LLGlobalEconomy "singleton.") Extract LLBaseEconomy; LLGlobalEconomy is now a trivial subclass of that. LLRegionEconomy, as you might suspect, now derives from LLBaseEconomy. LLToolGrab, an LLSingleton, was also explicitly instantiated by LLToolCompGun's constructor. Extract LLToolGrabBase, explicitly instantiated, with trivial subclass LLToolGrab, the LLSingleton instance. (WARNING: LLToolGrabBase methods have an unnerving tendency to go after LLToolGrab::getInstance(). I DO NOT KNOW what should be the relationship between the instance in LLToolCompGun and the LLToolGrab singleton instance.) LLGridManager declared a variant constructor accepting (const std::string&), with the comment: // initialize with an explicity grid file for testing. As there is no evidence of this being called from anywhere, delete it. LLChicletBar's constructor accepted an optional (const LLSD&). As the LLSD parameter wasn't used, and as there is no evidence of it being passed from anywhere, delete the parameter. LLViewerWindow::shutdownViews() was checking LLNavigationBar:: instanceExists(), then deleting its getInstance() pointer -- leaving a dangling LLSingleton instance pointer, a land mine if any subsequent code should attempt to reference it. Use deleteSingleton() instead. ~LLAppViewer() was calling LLViewerEventRecorder::instance() and then explicitly calling ~LLViewerEventRecorder() on that instance -- leaving the LLSingleton instance pointer pointing to an allocated-but-destroyed instance. Use deleteSingleton() instead.
2016-08-30Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-11-02Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-08-17Get unit tests (Integration and project) compiling and linking again.Rider Linden
2015-07-14merge 3.8.0-release and correct xml errors caused by reformattingOz Linden
2015-06-30Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-06-24MAINT-5232: Finish 7724e79aaf62: remove LLGlobalEconomy::initSingleton()Nat Goodspeed
2015-05-28MAINT-5232: Normalize LLGlobalEconomy's use of LLSingleton.Nat Goodspeed
LLSingleton currently presents two different usage styles: deriving MyClass from LLSingleton<MyClass>, or just using a typedef. Turns out LLGlobalEconomy is the ONLY class using the typedef style -- and the apologetic comment talks about a potential maintenance that hasn't actually happened. Derive LLGlobalEconomy from LLSingleton<LLGlobalEconomy>, like everyone else.
2015-04-14Pull merge from lindenlab/viewer-tools-update (includes viewer-release)Merov Linden
2015-04-10restore the ll[io]fstream because we need them as wrappers on Windows for ↵Oz Linden
wide char paths; on other platforms they are now just typedefs to the std classes
2015-04-09Merge lindenlab/viewer-tools-updateMerov Linden
2015-04-07replace llifstream and llofstream with std::ifstream and std::ofstream ↵Oz Linden
respectively
2014-10-09Mergedolphin
2014-09-28Pull merge from lindenlab/viewer-releaseMerov Linden
2014-08-06Merge with 3.7.13-releasedolphin
2014-07-31MAINT-4292 FIXED Make Merchant Outbox Folder not movable (protected)maksymsproductengine