diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 18:19:45 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 18:19:45 -0800 |
| commit | 3e3ef5c53d2e73c0836ef6056d222c4c35b8ac2d (patch) | |
| tree | 81c0151e33702653fb5533e9e10ca41cc906fa7a /indra/newview/llnearbychat.h | |
| parent | ce3dfcee3bec1ad782128ea891e21130911c9984 (diff) | |
| parent | de2fe92bb9df5f5f64dff79a4e6df35330c15329 (diff) | |
merge from https://hg.aws.productengine.com/secondlife/viewer-2-0/
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 (); |