summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-09-19 15:44:03 -0700
committerRichard Nelson <richard@lindenlab.com>2011-09-19 15:44:03 -0700
commit65fe2367a8241f0eb5ff4d27401f661b257e9736 (patch)
tree735f6ceca6cea2d2e3753fb13aa200a92d96bc38 /indra/newview
parent1c57963673193d5a3da638848c0540a5fbc91603 (diff)
EXP-1228 WIP Create toolbar widget class that displays list of buttons horizontally or vertically
created toolbar class and widget
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerwindow.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.h b/indra/newview/llviewerwindow.h
index edd241a742..47e0fdeab1 100644
--- a/indra/newview/llviewerwindow.h
+++ b/indra/newview/llviewerwindow.h
@@ -284,6 +284,7 @@ public:
void updateWorldViewRect(bool use_full_window=false);
LLView* getNonSideTrayView() { return mNonSideTrayView.get(); }
LLView* getFloaterViewHolder() { return mFloaterViewHolder.get(); }
+ LLView* getToolBarHolder() { return mToolBarHolder.get(); }
LLView* getHintHolder() { return mHintHolder.get(); }
LLView* getLoginPanelHolder() { return mLoginPanelHolder.get(); }
BOOL handleKey(KEY key, MASK mask);
@@ -446,6 +447,7 @@ protected:
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
+ LLHandle<LLView> mToolBarHolder; // container for toolbars
LLHandle<LLView> mHintHolder; // container for hints
LLHandle<LLView> mLoginPanelHolder; // container for login panel
LLPopupView* mPopupView; // container for transient popups