diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-13 15:15:15 -0400 |
| commit | 75722baf295aff7927bff3c70cdf0ec27399cb37 (patch) | |
| tree | a7a3fccc7bfebb4605c561e34ac66ad3c478368e /indra/newview/lltoolbarview.h | |
| parent | 5c68b2456e8603322a1f12694c196246752bab53 (diff) | |
| parent | d348deb7049cbaef7c228000525c7ee5a265464c (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/newview/lltoolbarview.h')
| -rw-r--r-- | indra/newview/lltoolbarview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lltoolbarview.h b/indra/newview/lltoolbarview.h index 9c4194ebed..7125dd9990 100644 --- a/indra/newview/lltoolbarview.h +++ b/indra/newview/lltoolbarview.h @@ -108,7 +108,8 @@ public: static BOOL handleDropTool(void* cargo_data, S32 x, S32 y, LLToolBar* toolbar); static void resetDragTool(LLToolBarButton* toolbarButton); LLInventoryObject* getDragItem(); - + LLView* getBottomToolbar() { return mBottomToolbarPanel; } + LLToolBar* getToolbar(EToolBarLocation toolbar) { return mToolbars[toolbar]; } bool isModified() const; protected: @@ -133,6 +134,7 @@ private: LLToolBarButton* mDragToolbarButton; LLInventoryObject* mDragItem; bool mShowToolbars; + LLView* mBottomToolbarPanel; }; extern LLToolBarView* gToolBarView; |