summaryrefslogtreecommitdiff
path: root/indra/newview/llmaterialmgr.h
AgeCommit message (Collapse)Author
2023-08-23Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-02-15SL-18330: Fix egregious existing build errors in contribute branch.Nat Goodspeed
2023-02-15SL-19159 Build fixesAndrey Kleshchev
2023-02-07SL-19159 Faster LLUUID and LLMaterialID hashing for std and boost containers ↵Henri Beauchamp
keys (#70) LLUUID and LLMaterialID already have an excellent entropy and value dispersion; there is therefore strictly no need to further (slowly) hash their value for use with std and boost libraries containers. This commit adds a trivial getDigest64() method to both LLUUID and LLMaterialID (which simply returns the XOR of the two 64 bits long words their value is made of), and uses it in std::hash and hash_value() specializations for use with containers.
2022-04-15SL-17219 WIP - Texture pipeline overhaulDave Parks
2018-02-14MAINT-7847 The presence of certain Avatars stops local specular textures ↵ruslantproductengine
from "sticking". Yes really. FIXED. Allows set material explicitly to material manager.
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.
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-03-20Clean up and use policies for Material transfer.Rider Linden
2015-03-19Adding new HTTP handling for material manager.Rider Linden
2013-06-26NORSPEC-29: use the MaxMaterialsPerTransaction simulator feature if availableOz Linden
2013-05-24NORSPEC-96 NORSPEC-189 another attempt at planar stretch across all 3 ↵Graham Madarasz
channels and make the materials CB use a UUID instead of this pointer for safety
2013-05-24NORSPEC-210 fix issues with the map used to store TE-specific registrations ↵Graham Madarasz
which was only invoking the CB for the last TE on log-in by replacing std::map with boost::unordered_map
2013-05-23NORSPEC-208 re-enable TE-specific material mgr registration to avoid ↵Graham Madarasz
cross-talk when editing faces
2013-05-17NORSPEC-189 restore old mat param update registrationGraham Madarasz (Graham)
2013-05-15NORSPEC-119 put back TE-specific get registration in material manager ↵Graham Madarasz
stomped during 'reloading'.
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more ↵Graham Madarasz
consistent and increased max range on repeats per meter
2013-05-12Avoid code duplication in LLMaterialMgrKitty Barnett
2013-05-11Fix many issues with selection misapplication and rendering not matching ↵Graham Madarasz
applied materials
2013-02-28Mark a material as 'pending' from the very first call to LLMaterialMgr::get()Kitty Barnett
2013-02-25Added LLMaterialMgr::remove() to remove material information from a faceKitty Barnett
2013-02-18Prevent a failed GET from causing an infinite material request loop when ↵Kitty Barnett
there are still pending POST requests for the same region
2013-01-03changes needed to compile with Linden-standard toolchainOz Linden
2012-12-12Clean up pending requests when regions are removed from LLWorldKitty Barnett
2012-12-12Don't call setTEMaterialID() while processing a PUT response; the region ↵Kitty Barnett
will send its own ObjectUpdate message
2012-12-12Refactor material retrieval to always invoke the region's GET material cap firstKitty Barnett
2012-12-05Added LLMaterialMgr::getAll() to retrieve all materials for the specified regionKitty Barnett
2012-12-03Handle delayed requesting and sending of materials through an idle callbackKitty Barnett
2012-12-03Added LLMaterialMgr::get() to retrieve individual materials (with optional ↵Kitty Barnett
callback)
2012-12-03Started LLMaterialMgr to handle viewer<->region materials communicationKitty Barnett
* refactored LLFloaterDebugMaterials::requestPutMaterials() to use LLMaterialMgr instead * replaced "Object editing" results list with information about the active selection instead