diff options
| author | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 09:04:27 -0400 |
|---|---|---|
| committer | Wolfpup Lowenhar <wolfpup67@earthlink.net> | 2010-10-27 09:04:27 -0400 |
| commit | ce34ba1b89a105e5f2f4902b2aebb486d16711e9 (patch) | |
| tree | 373b68976de2a260506615c6a1aa5380ffe15b22 /indra/newview/llviewerobject.cpp | |
| parent | 8bef9cc8137dc58b818c60dd1173959fcab40bd8 (diff) | |
| parent | 8947724baa6d595844daeee2f18c865d1886acc5 (diff) | |
Merge from 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: |