diff options
author | Oz Linden <oz@lindenlab.com> | 2011-07-21 15:02:03 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-07-21 15:02:03 -0400 |
commit | c118ec209907618c77613990fe2359d4f92802e6 (patch) | |
tree | b2fa95d1fa1563cdee89d2bf035b680c64918c0f /indra/newview/llviewerobject.cpp | |
parent | 54bb91fd03d0c2f2600993274c59ae89324eeb03 (diff) | |
parent | 67e365ba57bb7024a64bc0663782cd7f06b4a5cc (diff) |
merge up changes for 2.8.0 release
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r-- | indra/newview/llviewerobject.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index be9ff872c0..972993202a 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -81,7 +81,6 @@ #include "llviewerwindow.h" // For getSpinAxis #include "llvoavatar.h" #include "llvoavatarself.h" -#include "llvoclouds.h" #include "llvograss.h" #include "llvoground.h" #include "llvolume.h" @@ -167,8 +166,6 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco // llwarns << "Creating new tree!" << llendl; // res = new LLVOTree(id, pcode, regionp); break; res = NULL; break; - case LL_VO_CLOUDS: - res = new LLVOClouds(id, pcode, regionp); break; case LL_VO_SURFACE_PATCH: res = new LLVOSurfacePatch(id, pcode, regionp); break; case LL_VO_SKY: |