diff options
author | richard <none@none> | 2009-11-17 14:37:55 -0800 |
---|---|---|
committer | richard <none@none> | 2009-11-17 14:37:55 -0800 |
commit | d2fe3e808981c629c46b6df82d35fa073bef1906 (patch) | |
tree | d75464b9c78d083744901c3abb93ffd9c109e706 /indra/newview/llviewerwindow.h | |
parent | 630bb056413133d0e6ea58d00e148119d4fc5e3f (diff) | |
parent | cf1b7ef5e798533cb29213f84209d5f2abe996f0 (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; |