diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-11 09:28:32 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-11-11 09:28:32 -0500 |
| commit | e0759c82be89963c105fbc906ce219d1e922a636 (patch) | |
| tree | 572f06d8f2b96fa600186d4b67d181485e284b02 /indra/newview/llnearbychat.h | |
| parent | 4b36aeb9736fb71de7087063444652c9d87f370c (diff) | |
| parent | 5fa125ea0b733b3729208d90777d260db5e331e8 (diff) | |
merge
Diffstat (limited to 'indra/newview/llnearbychat.h')
| -rw-r--r-- | indra/newview/llnearbychat.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 5ef584c8ff..7c5975cbc5 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -37,8 +37,7 @@ class LLChatHistory; class LLNearbyChat: public LLPanel { public: - LLNearbyChat(); - ~LLNearbyChat(); + LLNearbyChat(const Params& p = LLPanel::getDefaultParams()); BOOL postBuild (); @@ -63,13 +62,14 @@ public: void loadHistory(); static LLNearbyChat* getInstance(); + void removeScreenChat(); private: void getAllowedRect (LLRect& rect); void onNearbySpeakers (); - + private: LLHandle<LLView> mPopupMenuHandle; |