diff options
author | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
commit | 95738da3d82b92e82744dbc6b377a3feae2e6441 (patch) | |
tree | cf1678c617ea644a14d20a40fbfc58f156fd9591 /indra/newview/llnearbychat.h | |
parent | 35c7c7a9b29ef4462ea969b393c25b59813ef169 (diff) | |
parent | af401ac6dc463db477210b0ff100014fbeb50a9a (diff) |
merge
Diffstat (limited to 'indra/newview/llnearbychat.h')
-rw-r--r-- | indra/newview/llnearbychat.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 20cbf7537d..cb4654654a 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -52,16 +52,15 @@ public: void onNearbyChatContextMenuItemClicked(const LLSD& userdata); bool onNearbyChatCheckContextMenuItem(const LLSD& userdata); - void setDocked (bool docked, bool pop_on_undock); - void toggleWindow (); + void setDocked (bool docked, bool pop_on_undock = true); /*virtual*/ void onOpen (const LLSD& key); - virtual void setVisible (BOOL visible); - virtual void setRect (const LLRect &rect); private: + virtual void applySavedVariables(); + void getAllowedRect (LLRect& rect); void onNearbySpeakers (); |