diff options
| author | prep linden <prep@lindenlab.com> | 2011-06-15 13:26:14 -0400 |
|---|---|---|
| committer | prep linden <prep@lindenlab.com> | 2011-06-15 13:26:14 -0400 |
| commit | 1b3f3fa7a66733c733a10963a2cf22477c3190e9 (patch) | |
| tree | c528c53b42550d1eaca80138185e526e2ab17136 /indra/newview/llfloatermodelpreview.h | |
| parent | a451c9e83431c7d39ef912680bf9d7411c7a12d2 (diff) | |
Fix for sh-1771 and also fixed a bug with a never ending load (with eventual crash) bug when a visual scene is missing.
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index a328bfb4dd..8e7189e8c6 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -108,7 +108,7 @@ public: void loadModelCallback();
void loadTextures() ; //called in the main thread.
- void processElement(daeElement* element);
+ void processElement(daeElement* element, bool& badElement);
std::vector<LLImportMaterial> getMaterials(LLModel* model, domInstance_geometry* instance_geo);
LLImportMaterial profileToMaterial(domProfile_COMMON* material);
std::string getElementLabel(daeElement *element);
|