diff options
author | Don Kjer <don@lindenlab.com> | 2010-12-13 12:34:39 -0800 |
---|---|---|
committer | Don Kjer <don@lindenlab.com> | 2010-12-13 12:34:39 -0800 |
commit | 9a322d1b7a6ee5380f8724b33a20c56c9583f093 (patch) | |
tree | 70ee8e942f30ac3ed2f371b60cfcba9adfd961c2 /indra/newview/llviewerwindow.h | |
parent | f4884faf3a020a718c611f34aa534e80d8a8b666 (diff) | |
parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) |
Merge from viewer-development
Diffstat (limited to 'indra/newview/llviewerwindow.h')
-rw-r--r-- | indra/newview/llviewerwindow.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h index 47fb7c4883..b8fd944321 100644 --- a/indra/newview/llviewerwindow.h +++ b/indra/newview/llviewerwindow.h @@ -288,6 +288,7 @@ public: LLView* getNonSideTrayView() { return mNonSideTrayView.get(); } LLView* getFloaterViewHolder() { return mFloaterViewHolder.get(); } LLView* getHintHolder() { return mHintHolder.get(); } + LLView* getLoginPanelHolder() { return mLoginPanelHolder.get(); } BOOL handleKey(KEY key, MASK mask); void handleScrollWheel (S32 clicks); @@ -447,6 +448,7 @@ protected: LLHandle<LLView> mNonSideTrayView; // parent of world view + bottom bar, etc...everything but the side tray LLHandle<LLView> mFloaterViewHolder; // container for floater_view LLHandle<LLView> mHintHolder; // container for hints + LLHandle<LLView> mLoginPanelHolder; // container for login panel LLPopupView* mPopupView; // container for transient popups class LLDebugText* mDebugText; // Internal class for debug text |