summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychat.h
diff options
context:
space:
mode:
authorangela <angela@lindenlab.com>2009-11-04 11:44:32 +0800
committerangela <angela@lindenlab.com>2009-11-04 11:44:32 +0800
commit1190b5d9eb6f1e1d698430957b99872abd354f81 (patch)
tree82915d4b684aaa4cae2d61ebc46a678fcf018c48 /indra/newview/llnearbychat.h
parentb4af6c3da8e5ef3e897cedfb2e1d677a3f37abe9 (diff)
parent3e3ef5c53d2e73c0836ef6056d222c4c35b8ac2d (diff)
merge
Diffstat (limited to 'indra/newview/llnearbychat.h')
-rw-r--r--indra/newview/llnearbychat.h7
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 ();