diff options
| author | skolb <none@none> | 2009-12-01 13:34:16 -0800 |
|---|---|---|
| committer | skolb <none@none> | 2009-12-01 13:34:16 -0800 |
| commit | 0ab6d36094cc52eea063f6d3b05262c111857f29 (patch) | |
| tree | 95840e0bf49f744520649b030d4bd65b99275bcf /indra/newview/llviewerwindow.h | |
| parent | 6dd3f54924b57224298f6d76c766b403d165783f (diff) | |
| parent | 6a888b653a1ee5ed0eeedd8994ff59652f2913aa (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 |