diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-13 17:36:29 -0500 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-12-13 17:36:29 -0500 |
| commit | e4f1f611a4736e4b0b78c0d61c3c5f576fec93d0 (patch) | |
| tree | 87aeed34bc9378648e1b8729bacf8462b4d9ec2d /indra/newview/llfloatermodelpreview.h | |
| parent | 20bc02d2544320a5ad99c61b8d012608319e3161 (diff) | |
| parent | d8aa31d10a89aa826cc549594c083a054a2ad967 (diff) | |
merged .hgtags
Diffstat (limited to 'indra/newview/llfloatermodelpreview.h')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodelpreview.h b/indra/newview/llfloatermodelpreview.h index 47de99ce25..64324854a5 100644 --- a/indra/newview/llfloatermodelpreview.h +++ b/indra/newview/llfloatermodelpreview.h @@ -70,7 +70,8 @@ public: GENERATING_VERTEX_BUFFERS, GENERATING_LOD, DONE, - ERROR_PARSING //basically loading failed + ERROR_PARSING, //basically loading failed + ERROR_MATERIALS, } eLoadState; U32 mState; |