diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-06-07 05:47:50 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-06-07 05:47:50 -0400 |
| commit | ce563795e1f5d7493b975393bea9ec5cab90fd6a (patch) | |
| tree | edc0b403ee80989bfa55b6d1cae3680093fb61fc /indra/newview/llfloatermodelpreview.h | |
| parent | d167ebe35f8cdec1ca88e0d817e2878f14a5aa68 (diff) | |
| parent | 89ea7ccfc7fd4c33eab4ad9123141fa40231a00d (diff) | |
MAINT-1144: Merge llhttpclient_test.cpp fix back to tip
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; |