diff options
author | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2011-07-08 18:25:07 -0700 |
commit | b9d6b5ef9a9797709397be983ec74c30cd1e0ce2 (patch) | |
tree | 9886deac5d65ee1873e8c75ed2af62943c872f63 /indra/newview/llviewerobject.cpp | |
parent | 615cc856a8abf44f62c58962f8b53178f9708ee3 (diff) | |
parent | ccb3ad90001c2b19cbd690d67317651ee0182f42 (diff) |
Merge viewer-development -> mesh-development
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 fdf1e4a89b..bbe929b7f7 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: |