diff options
| author | Tofu Buzzard <no-email> | 2010-10-27 11:03:39 +0100 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2010-10-27 11:03:39 +0100 |
| commit | 179e9e37ecbdcd1ad2133733047707ddd42e8c30 (patch) | |
| tree | db3d1d07ea7e2c769562eeb2f5ad09587df376f6 /indra/newview/llviewerobject.cpp | |
| parent | 26700e0d40c5f650e713f5209dd80b5df84b2b5a (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: |