diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-03-22 17:23:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-03-22 17:23:48 -0500 |
| commit | 6ff87e2840c585711e2927028a11ba5ce78a192a (patch) | |
| tree | ef91c0fe1d81a9e338ee16dd98d759f6980d113a /indra/newview/llfloatermodelpreview.h | |
| parent | 51a4867ae6bcf0ec71882ba77b1c995d98834126 (diff) | |
SH-1169 Import from slm instead of dae when appropriate.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 5efac91ba3..68fa0fa4c1 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -76,6 +76,7 @@ public: LLMatrix4 mTransform; BOOL mFirstTransform; LLVector3 mExtents[2]; + bool mTrySLM; std::map<daeElement*, LLPointer<LLModel> > mModel; @@ -97,6 +98,7 @@ public: virtual void run(); bool doLoadModel(); + bool loadFromSLM(const std::string& filename); void loadModelCallback(); void loadTextures() ; //called in the main thread. |