diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-10-27 11:27:21 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-10-27 11:27:21 -0500 |
| commit | 0451d51f4da9780e2f650b67672a29b3d07cb386 (patch) | |
| tree | f8b559b6b7389f82a1239715f6aa1ae6d74eaa47 /indra/newview/lldrawable.h | |
| parent | eb4581edf27a19641e3cd29c54a161548544fbeb (diff) | |
SL-18459 WIP -- fix for assert in setGLTFMaterial
Diffstat (limited to 'indra/newview/lldrawable.h')
| -rw-r--r-- | indra/newview/lldrawable.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 2a0f4c93ac..cdd8ae88bb 100644 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -42,6 +42,7 @@ #include "llrect.h" #include "llappviewer.h" // for gFrameTimeSeconds #include "llvieweroctree.h" +#include <unordered_set> class LLCamera; class LLDrawPool; @@ -223,7 +224,8 @@ public: friend class LLDrawPool; friend class LLSpatialBridge; - typedef std::set<LLPointer<LLDrawable> > drawable_set_t; + typedef std::unordered_set<LLPointer<LLDrawable> > drawable_set_t; + typedef std::set<LLPointer<LLDrawable> > ordered_drawable_set_t; typedef std::vector<LLPointer<LLDrawable> > drawable_vector_t; typedef std::list<LLPointer<LLDrawable> > drawable_list_t; typedef std::queue<LLPointer<LLDrawable> > drawable_queue_t; |