From a737232cb4a4bb699989a1adcbf24dd8fbb58847 Mon Sep 17 00:00:00 2001 From: Hazim Gazov Date: Mon, 3 May 2010 10:31:06 -0300 Subject: [PATCH] I'm dumb and removed setting the volume --- indra/newview/llimportobject.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/indra/newview/llimportobject.cpp b/indra/newview/llimportobject.cpp index 02529832d..72599ac8a 100644 --- a/indra/newview/llimportobject.cpp +++ b/indra/newview/llimportobject.cpp @@ -384,6 +384,7 @@ LLImportObject::LLImportObject(std::string id, LLSD prim) setFlags(FLAGS_USE_PHYSICS, prim["physical"].asInteger()); // Volume params LLVolumeParams volume_params; + volume_params.fromLLSD(prim["volume"]); setVolume(volume_params, 0, false); // Extra params @@ -659,6 +660,8 @@ void LLXmlImport::import(LLXmlImportOptions* import_options) // static void LLXmlImport::onNewPrim(LLViewerObject* object) { + + int currPrimIndex = sPrimIndex++; if(currPrimIndex >= (int)sPrims.size()) @@ -882,6 +885,7 @@ void LLXmlImport::onNewPrim(LLViewerObject* object) } } } + LLFloaterImportProgress::update(); }