summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorWilliam Todd Stinson <stinson@lindenlab.com>2012-10-19 11:21:18 -0700
committerWilliam Todd Stinson <stinson@lindenlab.com>2012-10-19 11:21:18 -0700
commit31f622ca049719e8d4da9368c1e7d5694ed069aa (patch)
tree793f5ecdff40e5ae5917dea89dd3fcc31ebe6977 /indra/newview
parent155cb976cb807771772b6bab62709709348c918b (diff)
parentf2a674274fc043e55ad3e78e05120d34ed2ff361 (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/pipeline.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index ba047487f5..b6f3301c6c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -706,6 +706,8 @@ void LLPipeline::cleanup()
mInitialized = FALSE;
mDeferredVB = NULL;
+
+ mCubeVB = NULL;
}
//============================================================================