Fix for sh-815: Added support for verifying a controllers skin weight count against the geometries vertex count

4 files changed, 546 insertions, 430 deletions

diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 8be5c427fe..75fa7b9d1f 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -598,6 +598,11 @@ void LLFloaterModelPreview::draw()
 			childSetTextArg("status", "[STATUS]", getString(LLModel::getStatusString(mModelPreview->getLoadState() - LLModelLoader::ERROR_PARSING)));
 		}
 		else
+		if ( mModelPreview->getLoadState() == LLModelLoader::ERROR_PARSING )
+		{
+			childSetTextArg("status", "[STATUS]", getString("status_parse_error"));
+		}
+		else
 		{
 			childSetTextArg("status", "[STATUS]", getString("status_idle"));
 		}
@@ -1250,6 +1255,23 @@ bool LLModelLoader::doLoadModel()
 		return false;
 	}
 	
+	//Verify some basic properties of the dae
+	//1. Basic validity check on controller 
+	U32 controllerCount = (int) db->getElementCount( NULL, "controller" );
+	bool result = false;
+	for ( int i=0; i<controllerCount; ++i )
+	{
+		domController* pController = NULL;
+		db->getElement( (daeElement**) &pController, i , NULL, "controller" );
+		result = mPreview->verifyController( pController );
+		if (!result)
+		{
+			setLoadState( ERROR_PARSING );
+			return true;
+		}
+	}
+
+
 	//get unit scale
 	mTransform.setIdentity();
 	
@@ -2178,6 +2200,90 @@ bool LLModelLoader::isNodeAJoint( domNode* pNode )
 
 	return false;
 }
+//-----------------------------------------------------------------------------
+// verifyCount
+//-----------------------------------------------------------------------------
+bool LLModelPreview::verifyCount( int expected, int result )

+{

+	if ( expected != result )

+	{

+		llinfos<< "Error: (expected/got)"<<expected<<"/"<<result<<"verts"<<llendl;

+		return false;

+	}

+	return true;

+}

+//-----------------------------------------------------------------------------
+// verifyController
+//-----------------------------------------------------------------------------
+bool LLModelPreview::verifyController( domController* pController )

+{	

+

+	bool result = true;

+

+	domSkin* pSkin = pController->getSkin();

+

+	if ( pSkin )

+	{

+		xsAnyURI & uri = pSkin->getSource();

+		domElement* pElement = uri.getElement();

+

+		if ( !pElement )

+		{

+			llinfos<<"Can't resolve skin source"<<llendl;

+			return false;

+		}

+

+		daeString type_str = pElement->getTypeName();

+		if ( stricmp(type_str, "geometry") == 0 )

+		{	

+			//Skin is reference directly by geometry and get the vertex count from skin

+			domSkin::domVertex_weights* pVertexWeights = pSkin->getVertex_weights();

+			U32 vertexWeightsCount = pVertexWeights->getCount();

+			domGeometry* pGeometry = (domGeometry*) (domElement*) uri.getElement();

+			domMesh* pMesh = pGeometry->getMesh();				

+			

+			if ( pMesh )

+			{

+				//Get vertex count from geometry

+				domVertices* pVertices = pMesh->getVertices();

+				if ( !pVertices )

+				{ 

+					llinfos<<"No vertices!"<<llendl;

+					return false;

+				}

+

+				if ( pVertices )

+				{

+					xsAnyURI src = pVertices->getInput_array()[0]->getSource();

+					domSource* pSource = (domSource*) (domElement*) src.getElement();

+					U32 verticesCount = pSource->getTechnique_common()->getAccessor()->getCount();

+					result = verifyCount( verticesCount, vertexWeightsCount );

+					if ( !result )

+					{

+						return result;

+					}

+				}

+			}	

+

+			U32 vcountCount = (U32) pVertexWeights->getVcount()->getValue().getCount();

+			result = verifyCount( vcountCount, vertexWeightsCount );	

+			if ( !result )

+			{

+				return result;

+			}

+

+			domInputLocalOffset_Array& inputs = pVertexWeights->getInput_array();

+			U32 sum = 0;

+			for (size_t i=0; i<vcountCount; i++)

+			{

+				sum += pVertexWeights->getVcount()->getValue()[i];

+			}

+			result = verifyCount( sum * inputs.getCount(), (domInt) pVertexWeights->getV()->getValue().getCount() );

+		}

+	}

+	

+	return result;

+}

 
 //-----------------------------------------------------------------------------
 // extractTranslation()
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 7d7464577a..a328bfb4dd 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -1,430 +1,438 @@
-/**
- * @file llfloatermodelpreview.h
- * @brief LLFloaterModelPreview class definition
- *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERMODELPREVIEW_H
-#define LL_LLFLOATERMODELPREVIEW_H
-
-#include "llfloaternamedesc.h"
-
-#include "lldynamictexture.h"
-#include "llfloatermodelwizard.h"
-#include "llquaternion.h"
-#include "llmeshrepository.h"
-#include "llmodel.h"
-#include "llthread.h"
-#include "llviewermenufile.h"
-
-class LLComboBox;
-class LLJoint;
-class LLViewerJointMesh;
-class LLVOAvatar;
-class LLTextBox;
-class LLVertexBuffer;
-class LLModelPreview;
-class LLFloaterModelPreview;
-class daeElement;
-class domProfile_COMMON;
-class domInstance_geometry;
-class domNode;
-class domTranslate;
-class LLMenuButton;
-class LLToggleableMenu;
-
-typedef std::map<std::string, LLMatrix4> JointTransformMap;
-typedef std::map<std::string, LLMatrix4>:: iterator JointTransformMapIt;
-
-const S32 NUM_LOD = 4;
-
-class LLModelLoader : public LLThread
-{
-public:
-	typedef enum
-	{
-		STARTING = 0,
-		READING_FILE,
-		CREATING_FACES,
-		GENERATING_VERTEX_BUFFERS,
-		GENERATING_LOD,
-		DONE,
-		ERROR_PARSING //basically loading failed
-	} eLoadState;
-
-	U32 mState;
-	std::string mFilename;
-	S32 mLod;
-	LLModelPreview* mPreview;
-	LLMatrix4 mTransform;
-	BOOL mFirstTransform;
-	LLVector3 mExtents[2];
-	bool mTrySLM;
-	
-	std::map<daeElement*, LLPointer<LLModel> > mModel;
-	
-	typedef std::vector<LLPointer<LLModel> > model_list;
-	model_list mModelList;
-
-	typedef std::vector<LLModelInstance> model_instance_list;
-	
-	typedef std::map<LLMatrix4, model_instance_list > scene;
-
-	scene mScene;
-
-	typedef std::queue<LLPointer<LLModel> > model_queue;
-
-	//queue of models that need a physics rep
-	model_queue mPhysicsQ;
-
-	LLModelLoader( std::string filename, S32 lod, LLModelPreview* preview, JointTransformMap& jointMap, 
-				   std::deque<std::string>& jointsFromNodes );
-	~LLModelLoader() ;
-
-	virtual void run();
-	bool doLoadModel();
-	bool loadFromSLM(const std::string& filename);
-	void loadModelCallback();
-
-	void loadTextures() ; //called in the main thread.
-	void processElement(daeElement* element);
-	std::vector<LLImportMaterial> getMaterials(LLModel* model, domInstance_geometry* instance_geo);
-	LLImportMaterial profileToMaterial(domProfile_COMMON* material);
-	std::string getElementLabel(daeElement *element);
-	LLColor4 getDaeColor(daeElement* element);
-	
-	daeElement* getChildFromElement( daeElement* pElement, std::string const & name );
-	
-	bool isNodeAJoint( domNode* pNode );
-	void processJointNode( domNode* pNode, std::map<std::string,LLMatrix4>& jointTransforms );
-	void extractTranslation( domTranslate* pTranslate, LLMatrix4& transform );
-	void extractTranslationViaElement( daeElement* pTranslateElement, LLMatrix4& transform );
-	
-	void setLoadState(U32 state);
-
-	void buildJointToNodeMappingFromScene( daeElement* pRoot );
-	void processJointToNodeMapping( domNode* pNode );
-
-
-	//map of avatar joints as named in COLLADA assets to internal joint names
-	std::map<std::string, std::string> mJointMap;
-	JointTransformMap& mJointList;	
-	std::deque<std::string>& mJointsFromNode;
-
-private:
-	static std::list<LLModelLoader*> sActiveLoaderList;
-	static bool isAlive(LLModelLoader* loader) ;
-};
-
-class LLFloaterModelPreview : public LLFloater
-{
-public:
-	
-	class DecompRequest : public LLPhysicsDecomp::Request
-	{
-	public:
-		S32 mContinue;
-		LLPointer<LLModel> mModel;
-		
-		DecompRequest(const std::string& stage, LLModel* mdl);
-		virtual S32 statusCallback(const char* status, S32 p1, S32 p2);
-		virtual void completed();
-		
-	};
-	static LLFloaterModelPreview* sInstance;
-	
-	LLFloaterModelPreview(const LLSD& key);
-	virtual ~LLFloaterModelPreview();
-	
-	virtual BOOL postBuild();
-	
-	BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-	BOOL handleMouseUp(S32 x, S32 y, MASK mask);
-	BOOL handleHover(S32 x, S32 y, MASK mask);
-	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); 
-	
-	static void onMouseCaptureLostModelPreview(LLMouseHandler*);
-	static void setUploadAmount(S32 amount) { sUploadAmount = amount; }
-
-	void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost);
-	
-	static void onBrowseLOD(void* data);
-	
-	static void onReset(void* data);
-
-	static void onUpload(void* data);
-	
-	static void onClearMaterials(void* data);
-	
-	static void refresh(LLUICtrl* ctrl, void* data);
-	
-	void updateResourceCost();
-	
-	void			loadModel(S32 lod);
-	
-	void onViewOptionChecked(const LLSD& userdata);
-	bool isViewOptionChecked(const LLSD& userdata);
-	bool isViewOptionEnabled(const LLSD& userdata);
-	void setViewOptionEnabled(const std::string& option, bool enabled);
-	void enableViewOption(const std::string& option);
-	void disableViewOption(const std::string& option);
-
-protected:
-	friend class LLModelPreview;
-	friend class LLMeshFilePicker;
-	friend class LLPhysicsDecomp;
-	
-	static void		onImportScaleCommit(LLUICtrl*, void*);
-	static void		onPelvisOffsetCommit(LLUICtrl*, void*);
-	static void		onUploadJointsCommit(LLUICtrl*,void*);
-	static void		onUploadSkinCommit(LLUICtrl*,void*);
-	
-	static void		onPhysicsLoadRadioCommit(LLUICtrl*,void *data);
-
-	static void		onPreviewLODCommit(LLUICtrl*,void*);
-	
-	static void		onGenerateNormalsCommit(LLUICtrl*,void*);
-	
-	static void		onAutoFillCommit(LLUICtrl*,void*);
-	static void		onLODParamCommit(LLUICtrl*,void*);
-	static void		onLODParamCommitTriangleLimit(LLUICtrl*,void*);
-	
-	static void		onExplodeCommit(LLUICtrl*, void*);
-	
-	static void onPhysicsParamCommit(LLUICtrl* ctrl, void* userdata);
-	static void onPhysicsStageExecute(LLUICtrl* ctrl, void* userdata);
-	static void onCancel(LLUICtrl* ctrl, void* userdata);
-	static void onPhysicsStageCancel(LLUICtrl* ctrl, void* userdata);
-	
-	static void onPhysicsBrowse(LLUICtrl* ctrl, void* userdata);
-	static void onPhysicsUseLOD(LLUICtrl* ctrl, void* userdata);
-	static void onPhysicsOptimize(LLUICtrl* ctrl, void* userdata);
-	static void onPhysicsDecomposeBack(LLUICtrl* ctrl, void* userdata);
-	static void onPhysicsSimplifyBack(LLUICtrl* ctrl, void* userdata);
-		
-	void			draw();
-	
-	void initDecompControls();
-	
-	void setStatusMessage(const std::string& msg);
-
-	LLModelPreview*	mModelPreview;
-	
-	LLPhysicsDecomp::decomp_params mDecompParams;
-	
-	S32				mLastMouseX;
-	S32				mLastMouseY;
-	LLRect			mPreviewRect;
-	U32				mGLName;
-	static S32		sUploadAmount;
-	
-	std::set<LLPointer<DecompRequest> > mCurRequest;
-	std::string mStatusMessage;
-
-	//use "disabled" as false by default
-	std::map<std::string, bool> mViewOptionDisabled;
-	
-	//store which lod mode each LOD is using
-	// 0 - load from file
-	// 1 - auto generate
-	// 2 - None
-	S32 mLODMode[4];
-
-	LLMenuButton* mViewOptionMenuButton;
-	LLToggleableMenu* mViewOptionMenu;
-	LLMutex* mStatusLock;
-
-};
-
-class LLMeshFilePicker : public LLFilePickerThread
-{
-public:
-	LLMeshFilePicker(LLModelPreview* mp, S32 lod);
-	virtual void notify(const std::string& filename);
-
-private:
-	LLModelPreview* mMP;
-	S32 mLOD;
-};
-
-
-class LLModelPreview : public LLViewerDynamicTexture, public LLMutex
-{	
-	typedef boost::signals2::signal<void (F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost)> details_signal_t;
-	typedef boost::signals2::signal<void (void)> model_loaded_signal_t;
-
-public:
-	LLModelPreview(S32 width, S32 height, LLFloater* fmp);
-	virtual ~LLModelPreview();
-
-	void resetPreviewTarget();
-	void setPreviewTarget(F32 distance);
-	void setTexture(U32 name) { mTextureName = name; }
-
-	void setPhysicsFromLOD(S32 lod);
-	BOOL render();
-	void update();
-	void genBuffers(S32 lod, bool skinned);
-	void clearBuffers();
-	void refresh();
-	void rotate(F32 yaw_radians, F32 pitch_radians);
-	void zoom(F32 zoom_amt);
-	void pan(F32 right, F32 up);
-	virtual BOOL needsRender() { return mNeedsUpdate; }
-	void setPreviewLOD(S32 lod);
-	void clearModel(S32 lod);
-	void loadModel(std::string filename, S32 lod);
-	void loadModelCallback(S32 lod);
-	void genLODs(S32 which_lod = -1, U32 decimation = 3, bool enforce_tri_limit = false);
-	void generateNormals();
-	void clearMaterials();
-	U32 calcResourceCost();
-	void rebuildUploadData();
-	void saveUploadData(bool save_skinweights, bool save_joint_poisitions);
-	void saveUploadData(const std::string& filename, bool save_skinweights, bool save_joint_poisitions);
-	void clearIncompatible(S32 lod);
-	void updateStatusMessages();
-	void clearGLODGroup();
-	void onLODParamCommit(bool enforce_tri_limit);
-
-	const bool getModelPivot( void ) const { return mHasPivot; }
-	void setHasPivot( bool val ) { mHasPivot = val; }
-	void setModelPivot( const LLVector3& pivot ) { mModelPivot = pivot; }
-
-	//Determines the viability of an asset to be used as an avatar rig (w or w/o joint upload caps)
-	void critiqueRigForUploadApplicability( const std::vector<std::string> &jointListFromAsset );
-	void critiqueJointToNodeMappingFromScene( void  );
-	//Is a rig valid so that it can be used as a criteria for allowing for uploading of joint positions
-	//Accessors for joint position upload friendly rigs
-	const bool isRigValidForJointPositionUpload( void ) const { return mRigValidJointUpload; }
-	void setRigValidForJointPositionUpload( bool rigValid ) { mRigValidJointUpload = rigValid; }
-	bool isRigSuitableForJointPositionUpload( const std::vector<std::string> &jointListFromAsset );
-	//Determines if a rig is a legacy from the joint list
-	bool isRigLegacy( const std::vector<std::string> &jointListFromAsset );	
-	//Accessors for the legacy rigs
-	const bool isLegacyRigValid( void ) const { return mLegacyRigValid; }
-	void setLegacyRigValid( bool rigValid ) { mLegacyRigValid = rigValid; }	
-
-	static void	textureLoadedCallback( BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );
-	
-	boost::signals2::connection setDetailsCallback( const details_signal_t::slot_type& cb ){  return mDetailsSignal.connect(cb);  }
-	boost::signals2::connection setModelLoadedCallback( const model_loaded_signal_t::slot_type& cb ){  return mModelLoadedSignal.connect(cb);  }
-	
-	void setLoadState( U32 state ) { mLoadState = state; }
-	U32 getLoadState() { return mLoadState; }
-	//setRestJointFlag: If an asset comes through that changes the joints, we want the reset to persist
-	void setResetJointFlag( bool state ) { if ( !mResetJoints ) mResetJoints = state; }
-	const bool getResetJointFlag( void ) const { return mResetJoints; }
-	void setRigWithSceneParity( bool state ) { mRigParityWithScene = state; }
-	const bool getRigWithSceneParity( void ) const { return mRigParityWithScene; }
-	
-	LLVector3 getTranslationForJointOffset( std::string joint );
-
-	void		createPreviewAvatar( void );
-	LLVOAvatar* getPreviewAvatar( void ) { return mPreviewAvatar; }
-
- protected:
-	friend class LLModelLoader;
-	friend class LLFloaterModelPreview;
-	friend class LLFloaterModelWizard;
-	friend class LLFloaterModelPreview::DecompRequest;
-	friend class LLFloaterModelWizard::DecompRequest;
-	friend class LLPhysicsDecomp;
-
-	LLFloater*  mFMP;
-
-	BOOL        mNeedsUpdate;
-	bool		mDirty;
-	bool		mGenLOD;
-	U32         mTextureName;
-	F32			mCameraDistance;
-	F32			mCameraYaw;
-	F32			mCameraPitch;
-	F32			mCameraZoom;
-	LLVector3	mCameraOffset;
-	LLVector3	mPreviewTarget;
-	LLVector3	mPreviewScale;
-	S32			mPreviewLOD;
-	U32			mResourceCost;
-	std::string mLODFile[LLModel::NUM_LODS];
-	bool		mLoading;
-	U32			mLoadState;
-	bool		mResetJoints;
-	bool		mRigParityWithScene;
-	
-	std::map<std::string, bool> mViewOption;
-
-	//GLOD object parameters (must rebuild object if these change)
-	bool mLODFrozen;
-	F32 mBuildShareTolerance;
-	U32 mBuildQueueMode;
-	U32 mBuildOperator;
-	U32 mBuildBorderMode;
-	U32 mRequestedLoDMode[LLModel::NUM_LODS];
-	S32 mRequestedTriangleCount[LLModel::NUM_LODS];
-	F32 mRequestedErrorThreshold[LLModel::NUM_LODS];
-	U32 mRequestedBuildOperator[LLModel::NUM_LODS];
-	U32 mRequestedQueueMode[LLModel::NUM_LODS];
-	U32 mRequestedBorderMode[LLModel::NUM_LODS];
-	F32 mRequestedShareTolerance[LLModel::NUM_LODS];
-	F32 mRequestedCreaseAngle[LLModel::NUM_LODS];
-
-	LLModelLoader* mModelLoader;
-
-	LLModelLoader::scene mScene[LLModel::NUM_LODS];
-	LLModelLoader::scene mBaseScene;
-
-	LLModelLoader::model_list mModel[LLModel::NUM_LODS];
-	LLModelLoader::model_list mBaseModel;
-
-	U32 mGroup;
-	std::map<LLPointer<LLModel>, U32> mObject;
-	U32 mMaxTriangleLimit;
-	
-	LLMeshUploadThread::instance_list mUploadData;
-	std::set<LLViewerFetchedTexture* > mTextureSet;
-
-	//map of vertex buffers to models (one vertex buffer in vector per face in model
-	std::map<LLModel*, std::vector<LLPointer<LLVertexBuffer> > > mVertexBuffer[LLModel::NUM_LODS+1];
-
-	details_signal_t mDetailsSignal;
-	model_loaded_signal_t mModelLoadedSignal;
-	
-	LLVector3	mModelPivot;
-	bool		mHasPivot;
-	
-	float		mPelvisZOffset;
-	
-	bool		mRigValidJointUpload;
-	bool		mLegacyRigValid;
-
-	bool		mLastJointUpdate;
-
-	std::deque<std::string> mMasterJointList;
-	std::deque<std::string> mMasterLegacyJointList;
-	std::deque<std::string> mJointsFromNode;
-	JointTransformMap		mJointTransformMap;
-	LLPointer<LLVOAvatar>	mPreviewAvatar;
-};
-
-#endif  // LL_LLFLOATERMODELPREVIEW_H
+/**

+ * @file llfloatermodelpreview.h

+ * @brief LLFloaterModelPreview class definition

+ *

+ * $LicenseInfo:firstyear=2004&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2010, Linden Research, Inc.

+ * 

+ * This library is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU Lesser General Public

+ * License as published by the Free Software Foundation;

+ * version 2.1 of the License only.

+ * 

+ * This library is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * Lesser General Public License for more details.

+ * 

+ * You should have received a copy of the GNU Lesser General Public

+ * License along with this library; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ * 

+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA

+ * $/LicenseInfo$

+ */

+

+#ifndef LL_LLFLOATERMODELPREVIEW_H

+#define LL_LLFLOATERMODELPREVIEW_H

+

+#include "llfloaternamedesc.h"

+

+#include "lldynamictexture.h"

+#include "llfloatermodelwizard.h"

+#include "llquaternion.h"

+#include "llmeshrepository.h"

+#include "llmodel.h"

+#include "llthread.h"

+#include "llviewermenufile.h"

+

+class LLComboBox;

+class LLJoint;

+class LLViewerJointMesh;

+class LLVOAvatar;

+class LLTextBox;

+class LLVertexBuffer;

+class LLModelPreview;

+class LLFloaterModelPreview;

+class daeElement;

+class domProfile_COMMON;

+class domInstance_geometry;

+class domNode;

+class domTranslate;

+class domController;

+class LLMenuButton;

+class LLToggleableMenu;

+

+typedef std::map<std::string, LLMatrix4> JointTransformMap;

+typedef std::map<std::string, LLMatrix4>:: iterator JointTransformMapIt;

+

+const S32 NUM_LOD = 4;

+

+class LLModelLoader : public LLThread

+{

+public:

+	typedef enum

+	{

+		STARTING = 0,

+		READING_FILE,

+		CREATING_FACES,

+		GENERATING_VERTEX_BUFFERS,

+		GENERATING_LOD,

+		DONE,

+		ERROR_PARSING //basically loading failed

+	} eLoadState;

+

+	U32 mState;

+	std::string mFilename;

+	S32 mLod;

+	LLModelPreview* mPreview;

+	LLMatrix4 mTransform;

+	BOOL mFirstTransform;

+	LLVector3 mExtents[2];

+	bool mTrySLM;

+	

+	std::map<daeElement*, LLPointer<LLModel> > mModel;

+	

+	typedef std::vector<LLPointer<LLModel> > model_list;

+	model_list mModelList;

+

+	typedef std::vector<LLModelInstance> model_instance_list;

+	

+	typedef std::map<LLMatrix4, model_instance_list > scene;

+

+	scene mScene;

+

+	typedef std::queue<LLPointer<LLModel> > model_queue;

+

+	//queue of models that need a physics rep

+	model_queue mPhysicsQ;

+

+	LLModelLoader( std::string filename, S32 lod, LLModelPreview* preview, JointTransformMap& jointMap, 

+				   std::deque<std::string>& jointsFromNodes );

+	~LLModelLoader() ;

+

+	virtual void run();

+	bool doLoadModel();

+	bool loadFromSLM(const std::string& filename);

+	void loadModelCallback();

+

+	void loadTextures() ; //called in the main thread.

+	void processElement(daeElement* element);

+	std::vector<LLImportMaterial> getMaterials(LLModel* model, domInstance_geometry* instance_geo);

+	LLImportMaterial profileToMaterial(domProfile_COMMON* material);

+	std::string getElementLabel(daeElement *element);

+	LLColor4 getDaeColor(daeElement* element);

+	

+	daeElement* getChildFromElement( daeElement* pElement, std::string const & name );

+	

+	bool isNodeAJoint( domNode* pNode );

+	void processJointNode( domNode* pNode, std::map<std::string,LLMatrix4>& jointTransforms );

+	void extractTranslation( domTranslate* pTranslate, LLMatrix4& transform );

+	void extractTranslationViaElement( daeElement* pTranslateElement, LLMatrix4& transform );

+	

+	void setLoadState(U32 state);

+

+	void buildJointToNodeMappingFromScene( daeElement* pRoot );

+	void processJointToNodeMapping( domNode* pNode );

+

+

+	//map of avatar joints as named in COLLADA assets to internal joint names

+	std::map<std::string, std::string> mJointMap;

+	JointTransformMap& mJointList;	

+	std::deque<std::string>& mJointsFromNode;

+

+private:

+	static std::list<LLModelLoader*> sActiveLoaderList;

+	static bool isAlive(LLModelLoader* loader) ;

+};

+

+class LLFloaterModelPreview : public LLFloater

+{

+public:

+	

+	class DecompRequest : public LLPhysicsDecomp::Request

+	{

+	public:

+		S32 mContinue;

+		LLPointer<LLModel> mModel;

+		

+		DecompRequest(const std::string& stage, LLModel* mdl);

+		virtual S32 statusCallback(const char* status, S32 p1, S32 p2);

+		virtual void completed();

+		

+	};

+	static LLFloaterModelPreview* sInstance;

+	

+	LLFloaterModelPreview(const LLSD& key);

+	virtual ~LLFloaterModelPreview();

+	

+	virtual BOOL postBuild();

+	

+	BOOL handleMouseDown(S32 x, S32 y, MASK mask);

+	BOOL handleMouseUp(S32 x, S32 y, MASK mask);

+	BOOL handleHover(S32 x, S32 y, MASK mask);

+	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); 

+	

+	static void onMouseCaptureLostModelPreview(LLMouseHandler*);

+	static void setUploadAmount(S32 amount) { sUploadAmount = amount; }

+

+	void setDetails(F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost);

+	

+	static void onBrowseLOD(void* data);

+	

+	static void onReset(void* data);

+

+	static void onUpload(void* data);

+	

+	static void onClearMaterials(void* data);

+	

+	static void refresh(LLUICtrl* ctrl, void* data);

+	

+	void updateResourceCost();

+	

+	void			loadModel(S32 lod);

+	

+	void onViewOptionChecked(const LLSD& userdata);

+	bool isViewOptionChecked(const LLSD& userdata);

+	bool isViewOptionEnabled(const LLSD& userdata);

+	void setViewOptionEnabled(const std::string& option, bool enabled);

+	void enableViewOption(const std::string& option);

+	void disableViewOption(const std::string& option);

+

+protected:

+	friend class LLModelPreview;

+	friend class LLMeshFilePicker;

+	friend class LLPhysicsDecomp;

+	

+	static void		onImportScaleCommit(LLUICtrl*, void*);

+	static void		onPelvisOffsetCommit(LLUICtrl*, void*);

+	static void		onUploadJointsCommit(LLUICtrl*,void*);

+	static void		onUploadSkinCommit(LLUICtrl*,void*);

+	

+	static void		onPhysicsLoadRadioCommit(LLUICtrl*,void *data);

+

+	static void		onPreviewLODCommit(LLUICtrl*,void*);

+	

+	static void		onGenerateNormalsCommit(LLUICtrl*,void*);

+	

+	static void		onAutoFillCommit(LLUICtrl*,void*);

+	static void		onLODParamCommit(LLUICtrl*,void*);

+	static void		onLODParamCommitTriangleLimit(LLUICtrl*,void*);

+	

+	static void		onExplodeCommit(LLUICtrl*, void*);

+	

+	static void onPhysicsParamCommit(LLUICtrl* ctrl, void* userdata);

+	static void onPhysicsStageExecute(LLUICtrl* ctrl, void* userdata);

+	static void onCancel(LLUICtrl* ctrl, void* userdata);

+	static void onPhysicsStageCancel(LLUICtrl* ctrl, void* userdata);

+	

+	static void onPhysicsBrowse(LLUICtrl* ctrl, void* userdata);

+	static void onPhysicsUseLOD(LLUICtrl* ctrl, void* userdata);

+	static void onPhysicsOptimize(LLUICtrl* ctrl, void* userdata);

+	static void onPhysicsDecomposeBack(LLUICtrl* ctrl, void* userdata);

+	static void onPhysicsSimplifyBack(LLUICtrl* ctrl, void* userdata);

+		

+	void			draw();

+	

+	void initDecompControls();

+	

+	void setStatusMessage(const std::string& msg);

+

+	LLModelPreview*	mModelPreview;

+	

+	LLPhysicsDecomp::decomp_params mDecompParams;

+	

+	S32				mLastMouseX;

+	S32				mLastMouseY;

+	LLRect			mPreviewRect;

+	U32				mGLName;

+	static S32		sUploadAmount;

+	

+	std::set<LLPointer<DecompRequest> > mCurRequest;

+	std::string mStatusMessage;

+

+	//use "disabled" as false by default

+	std::map<std::string, bool> mViewOptionDisabled;

+	

+	//store which lod mode each LOD is using

+	// 0 - load from file

+	// 1 - auto generate

+	// 2 - None

+	S32 mLODMode[4];

+

+	LLMenuButton* mViewOptionMenuButton;

+	LLToggleableMenu* mViewOptionMenu;

+	LLMutex* mStatusLock;

+

+};

+

+class LLMeshFilePicker : public LLFilePickerThread

+{

+public:

+	LLMeshFilePicker(LLModelPreview* mp, S32 lod);

+	virtual void notify(const std::string& filename);

+

+private:

+	LLModelPreview* mMP;

+	S32 mLOD;

+};

+

+

+class LLModelPreview : public LLViewerDynamicTexture, public LLMutex

+{	

+	typedef boost::signals2::signal<void (F32 x, F32 y, F32 z, F32 streaming_cost, F32 physics_cost)> details_signal_t;

+	typedef boost::signals2::signal<void (void)> model_loaded_signal_t;

+

+public:

+	LLModelPreview(S32 width, S32 height, LLFloater* fmp);

+	virtual ~LLModelPreview();

+

+	void resetPreviewTarget();

+	void setPreviewTarget(F32 distance);

+	void setTexture(U32 name) { mTextureName = name; }

+

+	void setPhysicsFromLOD(S32 lod);

+	BOOL render();

+	void update();

+	void genBuffers(S32 lod, bool skinned);

+	void clearBuffers();

+	void refresh();

+	void rotate(F32 yaw_radians, F32 pitch_radians);

+	void zoom(F32 zoom_amt);

+	void pan(F32 right, F32 up);

+	virtual BOOL needsRender() { return mNeedsUpdate; }

+	void setPreviewLOD(S32 lod);

+	void clearModel(S32 lod);

+	void loadModel(std::string filename, S32 lod);

+	void loadModelCallback(S32 lod);

+	void genLODs(S32 which_lod = -1, U32 decimation = 3, bool enforce_tri_limit = false);

+	void generateNormals();

+	void clearMaterials();

+	U32 calcResourceCost();

+	void rebuildUploadData();

+	void saveUploadData(bool save_skinweights, bool save_joint_poisitions);

+	void saveUploadData(const std::string& filename, bool save_skinweights, bool save_joint_poisitions);

+	void clearIncompatible(S32 lod);

+	void updateStatusMessages();

+	void clearGLODGroup();

+	void onLODParamCommit(bool enforce_tri_limit);

+

+	const bool getModelPivot( void ) const { return mHasPivot; }

+	void setHasPivot( bool val ) { mHasPivot = val; }

+	void setModelPivot( const LLVector3& pivot ) { mModelPivot = pivot; }

+

+	//Determines the viability of an asset to be used as an avatar rig (w or w/o joint upload caps)

+	void critiqueRigForUploadApplicability( const std::vector<std::string> &jointListFromAsset );

+	void critiqueJointToNodeMappingFromScene( void  );

+	//Is a rig valid so that it can be used as a criteria for allowing for uploading of joint positions

+	//Accessors for joint position upload friendly rigs

+	const bool isRigValidForJointPositionUpload( void ) const { return mRigValidJointUpload; }

+	void setRigValidForJointPositionUpload( bool rigValid ) { mRigValidJointUpload = rigValid; }

+	bool isRigSuitableForJointPositionUpload( const std::vector<std::string> &jointListFromAsset );

+	//Determines if a rig is a legacy from the joint list

+	bool isRigLegacy( const std::vector<std::string> &jointListFromAsset );	

+	//Accessors for the legacy rigs

+	const bool isLegacyRigValid( void ) const { return mLegacyRigValid; }

+	void setLegacyRigValid( bool rigValid ) { mLegacyRigValid = rigValid; }	

+	//Verify that a controller matches vertex counts

+	bool verifyController( domController* pController );

+

+	static void	textureLoadedCallback( BOOL success, LLViewerFetchedTexture *src_vi, LLImageRaw* src, LLImageRaw* src_aux, S32 discard_level, BOOL final, void* userdata );

+	

+	boost::signals2::connection setDetailsCallback( const details_signal_t::slot_type& cb ){  return mDetailsSignal.connect(cb);  }

+	boost::signals2::connection setModelLoadedCallback( const model_loaded_signal_t::slot_type& cb ){  return mModelLoadedSignal.connect(cb);  }

+	

+	void setLoadState( U32 state ) { mLoadState = state; }

+	U32 getLoadState() { return mLoadState; }

+	//setRestJointFlag: If an asset comes through that changes the joints, we want the reset to persist

+	void setResetJointFlag( bool state ) { if ( !mResetJoints ) mResetJoints = state; }

+	const bool getResetJointFlag( void ) const { return mResetJoints; }

+	void setRigWithSceneParity( bool state ) { mRigParityWithScene = state; }

+	const bool getRigWithSceneParity( void ) const { return mRigParityWithScene; }

+	

+	LLVector3 getTranslationForJointOffset( std::string joint );

+

+private:

+	//Utility function for controller vertex compare

+	bool verifyCount( int expected, int result );

+	//Creates the dummy avatar for the preview window

+	void		createPreviewAvatar( void );

+	//Accessor for the dummy avatar

+	LLVOAvatar* getPreviewAvatar( void ) { return mPreviewAvatar; }

+

+ protected:

+	friend class LLModelLoader;

+	friend class LLFloaterModelPreview;

+	friend class LLFloaterModelWizard;

+	friend class LLFloaterModelPreview::DecompRequest;

+	friend class LLFloaterModelWizard::DecompRequest;

+	friend class LLPhysicsDecomp;

+

+	LLFloater*  mFMP;

+

+	BOOL        mNeedsUpdate;

+	bool		mDirty;

+	bool		mGenLOD;

+	U32         mTextureName;

+	F32			mCameraDistance;

+	F32			mCameraYaw;

+	F32			mCameraPitch;

+	F32			mCameraZoom;

+	LLVector3	mCameraOffset;

+	LLVector3	mPreviewTarget;

+	LLVector3	mPreviewScale;

+	S32			mPreviewLOD;

+	U32			mResourceCost;

+	std::string mLODFile[LLModel::NUM_LODS];

+	bool		mLoading;

+	U32			mLoadState;

+	bool		mResetJoints;

+	bool		mRigParityWithScene;

+	

+	std::map<std::string, bool> mViewOption;

+

+	//GLOD object parameters (must rebuild object if these change)

+	bool mLODFrozen;

+	F32 mBuildShareTolerance;

+	U32 mBuildQueueMode;

+	U32 mBuildOperator;

+	U32 mBuildBorderMode;

+	U32 mRequestedLoDMode[LLModel::NUM_LODS];

+	S32 mRequestedTriangleCount[LLModel::NUM_LODS];

+	F32 mRequestedErrorThreshold[LLModel::NUM_LODS];

+	U32 mRequestedBuildOperator[LLModel::NUM_LODS];

+	U32 mRequestedQueueMode[LLModel::NUM_LODS];

+	U32 mRequestedBorderMode[LLModel::NUM_LODS];

+	F32 mRequestedShareTolerance[LLModel::NUM_LODS];

+	F32 mRequestedCreaseAngle[LLModel::NUM_LODS];

+

+	LLModelLoader* mModelLoader;

+

+	LLModelLoader::scene mScene[LLModel::NUM_LODS];

+	LLModelLoader::scene mBaseScene;

+

+	LLModelLoader::model_list mModel[LLModel::NUM_LODS];

+	LLModelLoader::model_list mBaseModel;

+

+	U32 mGroup;

+	std::map<LLPointer<LLModel>, U32> mObject;

+	U32 mMaxTriangleLimit;

+	

+	LLMeshUploadThread::instance_list mUploadData;

+	std::set<LLViewerFetchedTexture* > mTextureSet;

+

+	//map of vertex buffers to models (one vertex buffer in vector per face in model

+	std::map<LLModel*, std::vector<LLPointer<LLVertexBuffer> > > mVertexBuffer[LLModel::NUM_LODS+1];

+

+	details_signal_t mDetailsSignal;

+	model_loaded_signal_t mModelLoadedSignal;

+	

+	LLVector3	mModelPivot;

+	bool		mHasPivot;

+	

+	float		mPelvisZOffset;

+	

+	bool		mRigValidJointUpload;

+	bool		mLegacyRigValid;

+

+	bool		mLastJointUpdate;

+

+	std::deque<std::string> mMasterJointList;

+	std::deque<std::string> mMasterLegacyJointList;

+	std::deque<std::string> mJointsFromNode;

+	JointTransformMap		mJointTransformMap;

+	LLPointer<LLVOAvatar>	mPreviewAvatar;

+};

+

+#endif  // LL_LLFLOATERMODELPREVIEW_H

diff --git a/indra/newview/skins/default/xui/en/floater_model_preview.xml b/indra/newview/skins/default/xui/en/floater_model_preview.xml
index 9d46e1eec5..f58595b3c5 100644
--- a/indra/newview/skins/default/xui/en/floater_model_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_preview.xml
@@ -4,6 +4,7 @@
      name="Model Preview" title="Upload Model" width="620">
 
   <string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
   <string name="status_reading_file">Loading...</string>
   <string name="status_generating_meshes">Generating Meshes...</string>
   <string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>
diff --git a/indra/newview/skins/default/xui/en/floater_model_wizard.xml b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
index 3dd16f8eb1..8603682e3a 100644
--- a/indra/newview/skins/default/xui/en/floater_model_wizard.xml
+++ b/indra/newview/skins/default/xui/en/floater_model_wizard.xml
@@ -1019,6 +1019,7 @@ Advanced users familiar with 3d content creation tools may prefer to use the [se
 	<spinner visible="false" left="10" height="20" follows="top|left" width="80" top_pad="-50" value="1.0" min_val="0.01" max_val="64.0" name="import_scale"/>
 
 	<string name="status_idle">Idle</string>
+  <string name="status_parse_error">Dae parsing issue - see log for details.</string>
 	<string name="status_reading_file">Loading...</string>
 	<string name="status_generating_meshes">Generating Meshes...</string>
 	<string name="status_vertex_number_overflow">Error: Vertex number is more than 65534, aborted!</string>