diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 15:35:52 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 15:35:52 -0700 |
| commit | c24a5a3fb5e24ffe3faddb5c71e884d9a1513db0 (patch) | |
| tree | f86db3b8b82c734a60dc15cb3d0e79f990803adb /indra/newview/llfloatermodelpreview.cpp | |
| parent | 73bbcfb07bdb0ea5828a2e214b87c4fabe805eaa (diff) | |
| parent | 325c2b216907b84b02b425103b011a556222b474 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llfloatermodelpreview.cpp')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index f21d60dd03..675edd7643 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1399,7 +1399,7 @@ bool LLModelLoader::doLoadModel() if(model->getStatus() != LLModel::NO_ERRORS) { setLoadState(ERROR_PARSING + model->getStatus()) ; - return true ; //abort + return false; //abort } if (model.notNull() && validate_model(model)) |