diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-07-19 23:48:11 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-07-19 23:48:11 -0600 |
| commit | 83e48f4a5100ab1adadc27a3e7a0b23b68b8b568 (patch) | |
| tree | 68a2b81442389d1f9e54bce3dca5bc0e47b7a3e6 /indra/newview/llworld.cpp | |
| parent | 4dc0850da7469906e5ad052da71830b05005295b (diff) | |
| parent | 76eca5d0bce3e303f6d77b0d16f114320830ac6a (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; + } } |