diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 11:32:15 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 11:32:15 +0100 |
| commit | b95aef17ff696f94404ab507bd817f9a15d254cc (patch) | |
| tree | 9f64128e7696c618899f81050ba6f0ae9c75e94f /indra/newview/llfloaterimagepreview.h | |
| parent | db73037c2882af70a09ac768ddb3748d811c767a (diff) | |
| parent | 3d313630009366261ab99527fdd6eb7bb5eb5d3c (diff) | |
merge from viewer-trunk
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 |