diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 10:48:56 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-08-31 10:48:56 -0600 |
| commit | 749d9ebadcd201e27a9453de7a2d9320d78efbb5 (patch) | |
| tree | 6e2119ba44dd37543a81c2b67644c5fa1ac2b698 /indra/newview/llworld.cpp | |
| parent | bdd053abcffea1f4c30421176d0a3749027c6b7d (diff) | |
| parent | 48d949150cd445ce1e801a7a8ee67597a965f14b (diff) | |
Merge
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 6 |
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; + } } |