diff --git a/indra/newview/daeexport.cpp b/indra/newview/daeexport.cpp
index 6beff624b..1e71bf61b 100644
--- a/indra/newview/daeexport.cpp
+++ b/indra/newview/daeexport.cpp
@@ -74,7 +74,6 @@
 // menu includes
 #include "llevent.h"
 #include "llmemberlistener.h"
-#include "llview.h"
 #include "llselectmgr.h"
 
 // Floater and UI
@@ -82,8 +81,6 @@
 #include "lluictrlfactory.h"
 #include "llscrollcontainer.h"
 #include "lltexturectrl.h"
-#include "llcombobox.h"
-#include "llcheckboxctrl.h"
 
 // Files and cache
 #include "llcallbacklist.h"
@@ -188,16 +185,13 @@ class ColladaExportFloater
 {
 private:
 	typedef std::map<LLUUID, std::string> texture_list_t;
-	LLButton* mExportBtn;
-	LLButton* mBrowseBtn;
-	LLLineEditor* mFileName;
-	LLComboBox* mTextureTypeCombo;
-	LLCheckBoxCtrl* mTextureExportCheck;
+	LLView* mExportBtn;
+	LLView* mFileName;
+	LLView* mTextureTypeCombo;
 
 	DAESaver mSaver;
 	texture_list_t mTexturesToSave;
 	S32 mTotal;
-	S32 mIncluded;
 	S32 mNumTextures;
 	S32 mNumExportableTextures;
 	std::string mObjectName;
@@ -210,16 +204,25 @@ public:
 	{
 		mCommitCallbackRegistrar.add("ColladaExport.FilePicker",		boost::bind(&ColladaExportFloater::onClickBrowse, this));
 		mCommitCallbackRegistrar.add("ColladaExport.Export",			boost::bind(&ColladaExportFloater::onClickExport, this));
-		mCommitCallbackRegistrar.add("ColladaExport.TextureTypeCombo",	boost::bind(&ColladaExportFloater::onTextureTypeCombo, this));
-		mCommitCallbackRegistrar.add("ColladaExport.TextureExport",		boost::bind(&ColladaExportFloater::onTextureExportCheck, this));
+		mCommitCallbackRegistrar.add("ColladaExport.TextureTypeCombo",	boost::bind(&ColladaExportFloater::onTextureTypeCombo, this, boost::bind(&LLUICtrl::getControlName, _1), _2));
+		mCommitCallbackRegistrar.add("ColladaExport.TextureExport",		boost::bind(&ColladaExportFloater::onTextureExportCheck, this, _2));
 		LLUICtrlFactory::getInstance()->buildFloater(this, "floater_dae_export.xml");
 
 		addSelectedObjects();
-		childSetTextArg("Object Name", "[NAME]", mObjectName);
-		childSetTextArg("Exportable Prims", "[COUNT]", llformat("%d", mIncluded));
-		childSetTextArg("Exportable Prims", "[TOTAL]", llformat("%d", mTotal));
-		childSetTextArg("Exportable Textures", "[COUNT]", llformat("%d", mNumExportableTextures));
-		childSetTextArg("Exportable Textures", "[TOTAL]", llformat("%d", mNumTextures));
+		if (LLUICtrl* ctrl = findChild<LLUICtrl>("Object Name"))
+		{
+			ctrl->setTextArg("[NAME]", mObjectName);
+		}
+		if (LLUICtrl* ctrl = findChild<LLUICtrl>("Exportable Prims"))
+		{
+			ctrl->setTextArg("[COUNT]", llformat("%d", mSaver.mObjects.size()));
+			ctrl->setTextArg("[TOTAL]", llformat("%d", mTotal));
+		}
+		if (LLUICtrl* ctrl = findChild<LLUICtrl>("Exportable Textures"))
+		{
+			ctrl->setTextArg("[COUNT]", llformat("%d", mNumExportableTextures));
+			ctrl->setTextArg("[TOTAL]", llformat("%d", mNumTextures));
+		}
 		addTexturePreview();
 	}
 
@@ -233,17 +236,13 @@ public:
 
 	BOOL postBuild()
 	{
-		mFileName				= getChild<LLLineEditor>("file name editor");
-		mExportBtn				= getChild<LLButton>("export button");
-		mBrowseBtn				= getChild<LLButton>("browse button");
-		mTextureTypeCombo       = getChild<LLComboBox>("texture type combo");
-		mTextureExportCheck		= getChild<LLCheckBoxCtrl>("texture export check");
+		mFileName				= getChildView("file name editor");
+		mExportBtn				= getChildView("export button");
+		mTextureTypeCombo       = getChildView("texture type combo");
 		mTitleProgress			= getString("texture_progress");
 
-		mExportBtn->setEnabled(FALSE);
-		mFileName->setEnabled(FALSE);
 		mTextureTypeCombo->setValue(gSavedSettings.getS32(mTextureTypeCombo->getControlName()));
-		onTextureExportCheck();
+		onTextureExportCheck(getChildView("texture export check")->getValue());
 		return TRUE;
 	}
 
@@ -253,14 +252,14 @@ public:
 		setTitle(mTitleProgress);
 	}
 
-	void onTextureExportCheck()
+	void onTextureExportCheck(const LLSD& value)
 	{
-		mTextureTypeCombo->setEnabled(mTextureExportCheck->get());
+		mTextureTypeCombo->setEnabled(value);
 	}
 
-	void onTextureTypeCombo()
+	void onTextureTypeCombo(const std::string& control_name, const LLSD& value)
 	{
-		gSavedSettings.setS32(mTextureTypeCombo->getControlName(), mTextureTypeCombo->getValue());
+		gSavedSettings.setS32(control_name, value);
 	}
 
 	void onClickBrowse()
@@ -276,10 +275,7 @@ public:
 		if (filepicker->hasFilename())
 		{
 			mFileName->setValue(filepicker->getFilename());
-			if (mIncluded > 0)
-			{
-				mExportBtn->setEnabled(TRUE);
-			}
+			mExportBtn->setEnabled(TRUE);
 		}
 	}
 
@@ -310,14 +306,12 @@ public:
 			mSaver.mOffset = -selection->getFirstRootObject()->getRenderPosition();
 			mObjectName = selection->getFirstRootNode()->mName;
 			mTotal = 0;
-			mIncluded = 0;
 
 			for (LLObjectSelection::iterator iter = selection->begin(); iter != selection->end(); ++iter)
 			{
 				mTotal++;
 				LLSelectNode* node = *iter;
 				if (!node->getObject()->getVolume() || !DAEExportUtil::canExportNode(node)) continue;
-				mIncluded++;
 				mSaver.add(node->getObject(), node->mName);
 			}
 
@@ -814,7 +808,7 @@ bool DAESaver::saveDAE(std::string filename)
 			v4adapt verts(face->mPositions);
 			v4adapt norms(face->mNormals);
 
-			LLVector2* newCoord;
+			LLVector2* newCoord = NULL;
 
 			if (applyTexCoord)
 			{
diff --git a/indra/newview/skins/default/xui/en-us/floater_dae_export.xml b/indra/newview/skins/default/xui/en-us/floater_dae_export.xml
index 51f8fd80c..8d01c4ee0 100644
--- a/indra/newview/skins/default/xui/en-us/floater_dae_export.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_dae_export.xml
@@ -2,11 +2,11 @@
 <floater name="Collada Export" title="Collada Export" width="600" height="260" can_close="true" can_minimize="true">
   <string name="texture_progress">Collada Export: Saving textures ([COUNT] remaining)</string>
   <text name="file name" follows="bottom|left" left="10" bottom="-48" height="20">File Name:</text>
-  <line_editor name="file name editor" follows="bottom|left" left_delta="60" bottom_delta="4" width="360" height="20"/>
+  <line_editor name="file name editor" follows="bottom|left" left_delta="60" bottom_delta="4" width="360" height="20" enabled="false"/>
   <button name="browse button" label="Browse" follows="bottom|left" left_delta="363" bottom_delta="0" width="80" height="20">
     <button.commit_callback function="ColladaExport.FilePicker"/>
   </button>
-  <button name="export button" label="Export" follows="bottom|left" left_delta="83" bottom_delta="0" width="80" height="20">
+  <button name="export button" label="Export" follows="bottom|left" left_delta="83" bottom_delta="0" width="80" height="20" enabled="false">
     <button.commit_callback function="ColladaExport.Export"/>
   </button>
   <panel border="true" left="10" bottom_delta="-88" height="80" width="200" follows="bottom|left" name="object info panel">