diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 11:33:12 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-21 11:33:12 +0100 |
| commit | c2886da65dfc45ec28bf5e8ecd02525ac696629e (patch) | |
| tree | 37edc9dde054fbc370dcb62408027092ef18c877 /indra/newview/llfloaterimagepreview.h | |
| parent | 1e904da79c3eaa28cf53b63f306cc7482df77a95 (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 |