summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.h
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2010-12-08 14:50:25 -0500
committerprep <prep@lindenlab.com>2010-12-08 14:50:25 -0500
commita1e59112d028469870c7d1b38c8dbb56f556959d (patch)
treeb99cbcc6f879b7439313cbf8ce7da6546008fa7f /indra/newview/llfloatermodelpreview.h
parent9d165362201f38f8722227ad72f23bba28125119 (diff)
Fix for SH-424
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
-rw-r--r--indra/newview/llfloatermodelpreview.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h
index 05106644dc..2e98b8eb18 100644
--- a/indra/newview/llfloatermodelpreview.h
+++ b/indra/newview/llfloatermodelpreview.h
@@ -60,6 +60,7 @@ public:
GENERATING_VERTEX_BUFFERS,
GENERATING_LOD,
DONE,
+ ERROR_PARSING, //basically loading failed
} eLoadState;
U32 mState;
@@ -103,7 +104,9 @@ public:
void extractTranslation( domTranslate* pTranslate, LLMatrix4& transform );
void extractTranslationViaElement( daeElement* pTranslateElement, LLMatrix4& transform );
-
+ void setLoadState( U32 state ) { mState = state; }
+ U32 getLoadState( void ) { return mState; }
+
//map of avatar joints as named in COLLADA assets to internal joint names
std::map<std::string, std::string> mJointMap;
};