diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-10-19 13:38:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-10-19 13:38:57 -0400 |
| commit | 1d3487e2ea106afe48567d645dd5bbc023273cff (patch) | |
| tree | 7fcbf78b56ceb474822398631eb1857b72d6b169 | |
| parent | 7021e4b21b3f2ec7007f34f94bc9825949722d5b (diff) | |
| parent | c8fcb6c798b46ffbffdfa3c04bdb2846a87a60d4 (diff) | |
pull back changes from 3.4.1-beta9
| -rwxr-xr-x | .hgtags | 2 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -334,3 +334,5 @@ fba99f381b8d4ad1b7b42fa4993b29998d95be18 DRTVWR-179 524da902713e8b60322640b9825101add4a7c497 3.4.1-beta7 173c2809f9873499c4b9d6bc044ec941c954d3fb DRTVWR-228 1dc94555582f52718834081e7659e973ae4521f7 3.4.1-beta8 +52c164c8023a5e65f3dc1b0bbb7fa1dd0c631b6b DRTVWR-231 +9c4519aa5c70f7560111fb5c740d3a7dc20a845a 3.4.1-beta9 diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index e324d60fec..678898797f 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -706,6 +706,8 @@ void LLPipeline::cleanup() mInitialized = FALSE; mDeferredVB = NULL; + + mCubeVB = NULL; } //============================================================================ |