diff options
author | James Cook <james@lindenlab.com> | 2009-11-18 09:12:54 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-11-18 09:12:54 -0800 |
commit | 1a2694f92b8dc27e8eb1b53b83e3b5201754f589 (patch) | |
tree | 9101c2fe4aa02a52ccfb44bc9e68b1d27051e65e /indra/newview/llviewerwindow.h | |
parent | 22aa5eed910bbd1b366789cb96247899c744df75 (diff) | |
parent | acc53aa2f7a3fd939a207674a3bdf96d6e649f90 (diff) |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.h')
-rw-r--r-- | indra/newview/llviewerwindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index ce71ef6173..517993182b 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -212,6 +212,8 @@ public: // 3D world area in scaled pixels (via UI scale), use for most UI computations LLRect getWorldViewRectScaled() const; + S32 getWorldViewHeightScaled() const; + S32 getWorldViewWidthScaled() const; // 3D world area, in raw unscaled pixels LLRect getWorldViewRectRaw() const { return mWorldViewRectRaw; } @@ -415,6 +417,7 @@ protected: LLRect mWindowRectRaw; // whole window, including UI LLRect mWindowRectScaled; // whole window, scaled by UI size LLRect mWorldViewRectRaw; // area of screen for 3D world + LLRect mWorldViewRectScaled; // area of screen for 3D world scaled by UI size LLRootView* mRootView; // a view of size mWindowRectRaw, containing all child views LLVector2 mDisplayScale; |