diff options
| author | richard <none@none> | 2009-11-10 11:26:55 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-11-10 11:26:55 -0800 |
| commit | 1eaab29a95439c6688c903b224e660de0fc9a053 (patch) | |
| tree | 7f615e12667b45aeed76402bfbd8b87510bf6911 /indra/newview/llviewerwindow.h | |
| parent | 033d61ddb312080dc986803f6c1921cbd554c598 (diff) | |
| parent | 3b2d9f63e3a54660a8657ec573cce3f29f677047 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.h')
| -rw-r--r-- | indra/newview/llviewerwindow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index c2906b1718..d8f0a99a49 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -294,7 +294,6 @@ public: void updateKeyboardFocus(); void updateWorldViewRect(bool use_full_window=false); - void updateBottomTrayRect(); BOOL handleKey(KEY key, MASK mask); void handleScrollWheel (S32 clicks); @@ -451,6 +450,8 @@ protected: BOOL mIgnoreActivate; std::string mInitAlert; // Window / GL initialization requires an alert + + LLHandle<LLView> mWorldViewPlaceholder; // widget that spans the portion of screen dedicated to rendering the 3d world class LLDebugText* mDebugText; // Internal class for debug text |