diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 18:17:11 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-21 18:17:11 -0700 |
| commit | 5b9da4e8d91acd075dfaf33fb489c480c25e9ade (patch) | |
| tree | f296e32b384b341d9c626a4305cd7cd8924c9986 /indra/newview/llfloaterimagepreview.h | |
| parent | c139e52a5bf1ca2273d4fd22f28f55b12ba8a2d7 (diff) | |
| parent | 144b8349b3f0773ac575e178a0e3109d963be9a8 (diff) | |
Automated merge
Diffstat (limited to 'indra/newview/llfloaterimagepreview.h')
| -rw-r--r-- | indra/newview/llfloaterimagepreview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h index 466bd1d0ec..3a7e1ff7d8 100644 --- a/indra/newview/llfloaterimagepreview.h +++ b/indra/newview/llfloaterimagepreview.h @@ -143,7 +143,8 @@ protected: LLRect mPreviewRect; LLRectf mPreviewImageRect; LLPointer<LLViewerTexture> mImagep ; - + + std::string mImageLoadError; }; #endif // LL_LLFLOATERIMAGEPREVIEW_H |