diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-07 01:16:27 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-07 01:16:27 +0000 |
| commit | c4059553afa289f51f9966b4283b2a62b7103303 (patch) | |
| tree | 3b1a18de62fc258b847f264ff66d464d8be15034 /indra/newview/llviewerobject.cpp | |
| parent | 3d17ddd38baa9fd862114e6f90ce3ce809780b4f (diff) | |
SKIPPED 58849. merge -r 58856:58859 maintenance -> release
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 615bc1bf4f..6a20aa4a95 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -61,7 +61,6 @@ #include "llvoground.h" #include "llvolume.h" #include "llvolumemessage.h" -#include "llvopart.h" #include "llvopartgroup.h" #include "llvosky.h" #include "llvostars.h" @@ -105,13 +104,15 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco case LL_PCODE_LEGACY_GRASS: res = new LLVOGrass(id, pcode, regionp); break; case LL_PCODE_LEGACY_PART_SYS: - res = new LLVOPart(id, pcode, regionp); break; +// llwarns << "Creating old part sys!" << llendl; +// res = new LLVOPart(id, pcode, regionp); break; + res = NULL; break; case LL_PCODE_LEGACY_TREE: res = new LLVOTree(id, pcode, regionp); break; case LL_PCODE_TREE_NEW: - llwarns << "Creating new tree!" << llendl; -// res = new LLVOTree(id, pcode, regionp); break; - res = NULL; break; +// llwarns << "Creating new tree!" << llendl; +// res = new LLVOTree(id, pcode, regionp); break; + res = NULL; break; case LL_PCODE_LEGACY_TEXT_BUBBLE: res = new LLVOTextBubble(id, pcode, regionp); break; case LL_VO_CLOUDS: @@ -404,7 +405,6 @@ void LLViewerObject::initVOClasses() } llinfos << "Viewer Object size: " << sizeof(LLViewerObject) << llendl; LLVOGrass::initClass(); - LLVOPart::initClass(); LLVOWater::initClass(); LLVOSky::initClass(); LLVOVolume::initClass(); |