summaryrefslogtreecommitdiff
path: root/indra/newview/llviewershadermgr.cpp
diff options
context:
space:
mode:
authorStinson Linden <stinson@lindenlab.com>2014-04-24 01:50:17 +0100
committerStinson Linden <stinson@lindenlab.com>2014-04-24 01:50:17 +0100
commitb24552e313dc971d7750025c4b6f953ee3155ea9 (patch)
treea360a3c0e41ea515ef7c0393fca6f5b77b446109 /indra/newview/llviewershadermgr.cpp
parent592b7e2fdff3f5a405632cec5870e385a2b3f367 (diff)
MAINT-4009: Ensuring that the shader manager instance is released during cleanup.
Diffstat (limited to 'indra/newview/llviewershadermgr.cpp')
-rwxr-xr-xindra/newview/llviewershadermgr.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 9d2a4a50e1..dafe2cafec 100755
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -355,6 +355,16 @@ LLViewerShaderMgr * LLViewerShaderMgr::instance()
return static_cast<LLViewerShaderMgr*>(sInstance);
}
+// static
+void LLViewerShaderMgr::releaseInstance()
+{
+ if (sInstance != NULL)
+ {
+ delete sInstance;
+ sInstance = NULL;
+ }
+}
+
void LLViewerShaderMgr::initAttribsAndUniforms(void)
{
if (mReservedAttribs.empty())