From dc4f65a2ec1fdd65a77223baaadec38ba38c3bb6 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 30 Nov 2022 14:22:10 -0600 Subject: SL-18745 Fix for LLVertexBuffer assertion on shutdown. --- indra/newview/llreflectionmapmanager.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llreflectionmapmanager.h') diff --git a/indra/newview/llreflectionmapmanager.h b/indra/newview/llreflectionmapmanager.h index e0a2c00db3..4e2ff7c751 100644 --- a/indra/newview/llreflectionmapmanager.h +++ b/indra/newview/llreflectionmapmanager.h @@ -58,6 +58,9 @@ public: // allocate an environment map of the given resolution LLReflectionMapManager(); + // release any GL state + void cleanup(); + // maintain reflection probes void update(); -- cgit v1.2.3 From ed2b768da29f8dc4f96b463fe4d4087deab75a37 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Fri, 2 Dec 2022 09:56:42 -0600 Subject: SL-18745 Fix for assert on teleport. --- indra/newview/llreflectionmapmanager.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'indra/newview/llreflectionmapmanager.h') diff --git a/indra/newview/llreflectionmapmanager.h b/indra/newview/llreflectionmapmanager.h index 4e2ff7c751..14a6c089da 100644 --- a/indra/newview/llreflectionmapmanager.h +++ b/indra/newview/llreflectionmapmanager.h @@ -97,6 +97,9 @@ public: private: friend class LLPipeline; + // initialize mCubeFree array to default values + void initCubeFree(); + // delete the probe with the given index in mProbes void deleteProbe(U32 i); -- cgit v1.2.3