diff options
| author | prep <prep@lindenlab.com> | 2010-10-28 13:54:43 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2010-10-28 13:54:43 -0400 |
| commit | a91bff4036bbdd0f32722ed573f9f44ab00f00f0 (patch) | |
| tree | a2ee17189b530ace49c886d8a8acc4deb32620b5 /indra/newview/llviewerobject.cpp | |
| parent | 53d5fd1e9bb59868b793f9bef0529cd62ca70126 (diff) | |
| parent | 32bcdd11990e1fa5126a15a2bd22249162c0806a (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 9dc3cb9ce1..8d9f27556d 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -170,8 +170,10 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco res = new LLVOSurfacePatch(id, pcode, regionp); break; case LL_VO_SKY: res = new LLVOSky(id, pcode, regionp); break; + case LL_VO_VOID_WATER: + res = new LLVOVoidWater(id, pcode, regionp); break; case LL_VO_WATER: - res = new LLVOWater(id, pcode, regionp); break; + res = new LLVOWater(id, pcode, regionp); break; case LL_VO_GROUND: res = new LLVOGround(id, pcode, regionp); break; case LL_VO_PART_GROUP: |