diff options
| author | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
| commit | 2b69cb9e9cf5209a8156580b74e6662e4cc4243f (patch) | |
| tree | f38805b6ca5b60e8c0130259865dc610eaee7a0b /indra/newview/llnearbychat.h | |
| parent | 913786a62b2b8d8e6d9c483ea805a21e694fd818 (diff) | |
| parent | 4ddaa866dde7a92e56617a32464e0667de3759ef (diff) | |
Merged change to auto play pref (DEV-41787)
Diffstat (limited to 'indra/newview/llnearbychat.h')
| -rw-r--r-- | indra/newview/llnearbychat.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 63e780c4bf..20cbf7537d 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -33,14 +33,14 @@ #ifndef LL_LLNEARBYCHAT_H_ #define LL_LLNEARBYCHAT_H_ -#include "llfloater.h" +#include "lldockablefloater.h" #include "llscrollbar.h" #include "llchat.h" class LLResizeBar; class LLChatHistory; -class LLNearbyChat: public LLFloater +class LLNearbyChat: public LLDockableFloater { public: LLNearbyChat(const LLSD& key); @@ -53,10 +53,17 @@ public: bool onNearbyChatCheckContextMenuItem(const LLSD& userdata); void setDocked (bool docked, bool pop_on_undock); + void toggleWindow (); /*virtual*/ void onOpen (const LLSD& key); + virtual void setVisible (BOOL visible); + + virtual void setRect (const LLRect &rect); + private: + void getAllowedRect (LLRect& rect); + void onNearbySpeakers (); void add_timestamped_line(const LLChat& chat, const LLColor4& color); |