summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Collapse)Author
2018-08-01MAINT-8803 Better UI handling of unrecognized inventory itemsmaxim_productengine
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
2014-07-22Sync merge with lindenlab/viewer-releaseMerov Linden
2014-06-18Merge downstream codesimon
2014-06-17Merge with 3.7.9-releasedolphin
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-06-07MAINT-4001 : Make Received Items not movable (protected), consolidate ↵Merov Linden
Received Items folders which may have been moved
2014-05-30DD-92 : pull merge lindenlab/sunshine-external to get AISv3 workMerov Linden
2014-05-30Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-16ACME-1459: Experience tab added to the about land tab for editing parcel ↵dolphin
Experiences
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Merge with 3.7.7-releasedolphin
2014-05-07Merge downstream version 3.7.8 codesimon
2014-05-01parcel experience lists can be manipulated through the ParcelAccessListUpdatedolphin
message
2014-04-23MAINT-2361 FIXED One and the same user shown in Allowed and in Banned ↵andreykproductengine
Residents lists
2014-04-22MergeXiaohong Bao
2013-12-05mergeBrad Payne (Vir Linden)
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-01changed over to manual naming of MemTrackable statsRichard Linden
changed claimMem and disclaimMem behavior to not pass through argument added more mem tracking stats to floater_stats
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-09-03MAINT-3082 : Remove unused viewer LLParcel codesimon_linden
2013-08-15moved unit types out of LLUnits namespace, since they are prefixedRichard Linden
2013-08-14BUILDFIX: added header for numeric_limits support on gccRichard Linden
added convenience types for units F32Seconds, etc.
2013-08-12SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue ↵Richard Linden
bounces once per second SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary made llerrs/infos/etc properly variadic wrt tags LL_INFOS("A", "B", "C") works, for example fixed unit tests remove llsimplestat
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09Refactoring link creation calls in preparation for adding AIS v3 hook.Don Kjer
2013-08-07MAINT-2257 : Create ability to limit region/estate and parcel access bysimon
either Piof or Group membership (viewer changes). Using Mnikolenko's patch
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-06-10SH-4216 WIP - finished item/cat update and reorg of aisv3 codeBrad Payne (Vir Linden)
2013-06-05merge with viewer-releaseRichard Linden