diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-26 10:59:37 -0700 |
| commit | ebce1a4ea8dedcef25c82fa5d877d780b12a3a8f (patch) | |
| tree | 60af20175edacbcbea2b8c75d2ca4baba9d36012 /indra/newview/llviewerobject.cpp | |
| parent | a40a2a7a465f6e03ca495c301dfbf7bfa376be30 (diff) | |
| parent | 235980dfe3f5683c7871285888001740c1c5d66f (diff) | |
STORM-416 : 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: |