diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 9db6d5e08ce5b41cfd05b296fdd3f8401e600792..127318d06c9b8b03f2a967ac770dd0bdd9a28861 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -131,6 +131,12 @@ void LLWorld::destroyClass()
 		LLVOCache::getInstance()->destroyClass() ;
 	}
 	LLViewerPartSim::getInstance()->destroyClass();
+
+	mDefaultWaterTexturep = NULL ;
+	for (S32 i = 0; i < 8; i++)
+	{
+		mEdgeWaterObjects[i] = NULL;
+	}
 }