diff options
| author | simon <none@none> | 2014-02-18 16:41:21 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-18 16:41:21 -0800 |
| commit | 52ce788d0cf77361dc337edaf136f401acd0d4a9 (patch) | |
| tree | 10b483a50bb1f3d897ece66d118036201bd74af7 /indra/newview/llpreviewtexture.h | |
| parent | 54ab932884c386950f4f31b9ee63446053c03d59 (diff) | |
| parent | a347267cf1c55a3bd57d30117b8aa834623e1d61 (diff) | |
Pull in viewer-lion to lock down next release
Diffstat (limited to 'indra/newview/llpreviewtexture.h')
| -rwxr-xr-x | indra/newview/llpreviewtexture.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpreviewtexture.h b/indra/newview/llpreviewtexture.h index cd16bacde2..97e74706cc 100755 --- a/indra/newview/llpreviewtexture.h +++ b/indra/newview/llpreviewtexture.h @@ -70,6 +70,7 @@ protected: /* virtual */ BOOL postBuild(); bool setAspectRatio(const F32 width, const F32 height); static void onAspectRatioCommit(LLUICtrl*,void* userdata); + void adjustAspectRatio(); private: void updateImageID(); // set what image is being uploaded. @@ -95,5 +96,6 @@ private: F32 mAspectRatio; LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ; + std::vector<std::string> mRatiosList; }; #endif // LL_LLPREVIEWTEXTURE_H |