diff options
| author | James Cook <james@lindenlab.com> | 2009-12-01 08:51:32 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-01 08:51:32 -0800 |
| commit | 5e11affddb1b8816f57f9314381486c00033e080 (patch) | |
| tree | b21e2486be2daaa9b249588ce7d88f0f9f472814 /indra/newview/llviewerwindow.h | |
| parent | 677938e6531209ca9ccd29146454af67f1c743c7 (diff) | |
| parent | bf34e572e7acd0f80d103318b76b4abe32c802d3 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.h')
| -rw-r--r-- | indra/newview/llviewerwindow.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 747fd3b253..1d564a1338 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -298,7 +298,8 @@ public: void updateKeyboardFocus(); void updateWorldViewRect(bool use_full_window=false); - + LLView* getNonSideTrayView() { return mNonSideTrayView.get(); } + LLView* getFloaterViewHolder() { return mFloaterViewHolder.get(); } BOOL handleKey(KEY key, MASK mask); void handleScrollWheel (S32 clicks); @@ -459,6 +460,8 @@ protected: 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 + LLHandle<LLView> mNonSideTrayView; // parent of world view + bottom bar, etc...everything but the side tray + LLHandle<LLView> mFloaterViewHolder; // container for floater_view class LLDebugText* mDebugText; // Internal class for debug text |