summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-09-21 16:04:12 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-09-21 16:04:12 -0400
commit8665dee5f6cca501ec94b33e56c0c4de284fd757 (patch)
tree9a3356ac50a7fa084c698092596c6ba3cba59423 /indra/newview/llworld.cpp
parenta66b5fb8cfc590110bb698d490510d66b6d8b430 (diff)
parent2ae5e8db53e6d89e741cda0ce45e8cf65595bd16 (diff)
reconciled .hgtags
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 4a6ec7fdbb..a7ae456f3c 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -127,6 +127,12 @@ void LLWorld::destroyClass()
LLVOCache::getInstance()->destroyClass() ;
}
LLViewerPartSim::getInstance()->destroyClass();
+
+ mDefaultWaterTexturep = NULL ;
+ for (S32 i = 0; i < 8; i++)
+ {
+ mEdgeWaterObjects[i] = NULL;
+ }
}