summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
AgeCommit message (Collapse)Author
2023-08-23Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-08-11SL-20024: Miscellaneous cleanupCosmic Linden
2023-08-11SL-20024: Fix author attributions not transferring for saved object ↵Cosmic Linden
materials, fix item not renamed
2023-04-19SL-19609 Urls aren't dispatched according to the indicated gridAndrey Kleshchev
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-10-13SL-18125 Separate GLTF permissions from normal uploadsAndrey Kleshchev
2022-10-11SL-18165 Tighten up some command permissionsAndrey Kleshchev
2022-06-28SL-17379 More complete integration of material asset typeDave Parks
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
2020-11-10SL-14303 Fix LLWearableType to not spam in logsAndrey Kleshchev
2020-08-10SL-13669 tests should cover import/export category from llsdMnikolenko Productengine
2020-08-04SL-13669 Change inventory cache to use a standard LLSD formatMnikolenko Productengine
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2019-11-13Merge in from viewer-release 6.3.5Dave Houlton
2019-11-12Downstream merge from 494-maint-wassailAndreyL ProductEngine
2019-09-05Upstream merge from viewer-nekoAndreyL ProductEngine
2019-08-29Merge from lindenlab/viewer-releaseandreykproductengine
2019-08-26Merge 6.3.1 viewer-releaseGraham Linden
2019-08-10DRTVWR-493 LLUI to LLParamSingletonandreykproductengine
2019-08-15SL-209 Cleanup Merchant Outboxandreykproductengine
2018-07-30MAINT-8904: Creating new setting in inventory now causes simulator to assign ↵Rider Linden
default asset ID to inventory item.
2018-06-28Creating settings objects in the correct folders. Correctly check if clouds ↵Rider Linden
paused.
2018-06-08[DRTVWR-476] - create new wearable typeAnchor Linden
2018-05-10Settings editor available from the open context on the menu. Can edit ↵Rider Linden
inventory items.
2018-05-03Inventory context menus and increment attrib for settings panels.Rider Linden
2018-03-06Settings type inventory objects and upload the assests.Rider Linden
2018-02-26Added settings inventory object with subtypeRider Linden
2017-11-06MAINT-7961 Search link in Recent tab of Inventory should open the Search ↵Mnikolenko Productengine
filters for Inventory
2017-06-20MAINT-7508 Fixed Trash says that it will delete items, but some items are ↵andreykproductengine
being ignored
2017-05-22MAINT-7419 Workaround for some purge and trash issues, stuck descendants countandreykproductengine
2017-02-15MAINT-7118 Swapping legacy people API with new cacheandreykproductengine
2016-11-21Merged in Ansariel/storm-2141AndreyL ProductEngine
2016-11-14STORM-2141: Fix various inventory floater related issues:Ansariel
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path * Closing new inventory windows don't release memory * During shutdown legacy and inoperable code for inventory window cleanup is called * Remove old and unused inventory legacy code
2016-11-14Merged in lindenlab/viewer-cleanupAndreyL ProductEngine
2016-11-04MAINT-6906 Editing landmark name removes the land mark coordinatesandreykproductengine
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-07-07Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-06-17MAINT-6490 Newly created inventory reports version mismatchandreykproductengine
2016-05-20Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-04-20MAINT-6341 Changing properties of the object in inventory are not saved ↵Mnikolenko Productengine
after transfer it to next owner
2016-04-04merge with 4.0.3-releaseOz Linden
2016-03-31I hate polluting the commit history.Aura Linden
2016-03-31Faster to copy changes than merge branches.Aura Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-14MAINT-5732: Change to the way event polling handles error conditions and ↵Rider Linden
cancel calls. Refactor any remaining LLCore::HTTPHandlers to use boost::shared_ptr Started minor refactor in the materials manager into coroutines (unfinished)
2015-08-28MAINT-5574: Added default parameter for callbalk on AISAPI interface.Rider Linden
Better check on callback exsit in coroutine Don't create AISAPI::completion_t if there is no call back passed.
2015-08-12MAINT-5500: Finish converting the AIS responders to the new coroutine model, ↵Rider Linden
Cleaned up dead an unused code. MAINT-4952: Added COPY and MOVE methods to Core:Http adapter
2015-08-11MergeRider Linden
2015-07-31Mystery solved! compl is a keyword... who knew!rider
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 10:16:56 +0000