From 5612f13dc8693d89cb5c89f8b1a15115742fba8d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 2 Sep 2009 02:59:07 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 * Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801 * New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453 --- indra/newview/llbottomtray.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'indra/newview/llbottomtray.h') diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index 7f606339bc..a8fe65a9d3 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -42,6 +42,7 @@ class LLLayoutStack; class LLNotificationChiclet; class LLTalkButton; class LLNearbyChatBar; +class LLIMChiclet; class LLBottomTray : public LLSingleton @@ -55,7 +56,6 @@ public: BOOL postBuild(); LLChicletPanel* getChicletPanel() {return mChicletPanel;} - LLNotificationChiclet* getIMWell() {return mIMWell;} LLNotificationChiclet* getSysWell() {return mSysWell;} LLNearbyChatBar* getNearbyChatBar() {return mNearbyChatBar;} @@ -69,7 +69,6 @@ public: virtual void setVisible(BOOL visible); private: - void updateImChicletCount(); protected: @@ -79,8 +78,12 @@ protected: static void* createNearbyChatBar(void* userdata); + /** + * Creates IM Chiclet based on session type (IM chat or Group chat) + */ + LLIMChiclet* createIMChiclet(const LLUUID& session_id); + LLChicletPanel* mChicletPanel; - LLNotificationChiclet* mIMWell; LLNotificationChiclet* mSysWell; LLTalkButton* mTalkBtn; LLNearbyChatBar* mNearbyChatBar; -- cgit v1.2.3 From 79653dfed48105019b8ecca9cf4bfaa2a390e100 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 7 Sep 2009 22:55:07 +0000 Subject: merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3 * Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790 * New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788 * EXT-272 - Draggable Landmarks * EXT-715 - Block List Panel * EXT-782 - Implement advanced place information accordions --- indra/newview/llbottomtray.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'indra/newview/llbottomtray.h') diff --git a/indra/newview/llbottomtray.h b/indra/newview/llbottomtray.h index a8fe65a9d3..c3c840ede0 100644 --- a/indra/newview/llbottomtray.h +++ b/indra/newview/llbottomtray.h @@ -33,6 +33,8 @@ #ifndef LL_LLBOTTOMPANEL_H #define LL_LLBOTTOMPANEL_H +#include + #include "llpanel.h" #include "llimview.h" @@ -68,6 +70,10 @@ public: virtual void onFocusLost(); virtual void setVisible(BOOL visible); + virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); + + void showCameraAndMoveControls(BOOL visible); + private: protected: @@ -76,6 +82,9 @@ protected: void onChicletClick(LLUICtrl* ctrl); + bool onShowCamMoveCtrlsContextMenuItemEnabled(const LLSD& userdata); + void onShowCamMoveCtrlsContextMenuItemClicked(const LLSD& userdata); + static void* createNearbyChatBar(void* userdata); /** @@ -88,7 +97,9 @@ protected: LLTalkButton* mTalkBtn; LLNearbyChatBar* mNearbyChatBar; LLLayoutStack* mToolbarStack; - + LLMenuGL* mShowCamMoveCtrlsContextMenu; + LLPanel* mMovementPanel; + LLPanel* mCamPanel; }; #endif // LL_LLBOTTOMPANEL_H -- cgit v1.2.3