diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 14:30:32 -0700 |
| commit | f7af29ab40c2405504969a453eba3919be1af5c5 (patch) | |
| tree | f31f6d31582e8ff89c769334cb70e1076c887ef7 /indra/newview/llviewerobject.cpp | |
| parent | c2500f808cd8e1957054d5ec1b3555e30698c2b3 (diff) | |
| parent | 889aff8d87a4dbf3ca43c43bdeed825f67fd5e60 (diff) | |
merge with viewer-development
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 a58b0d68de..0e1553c421 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -168,8 +168,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: |