diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-11-01 15:52:18 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-11-01 15:52:18 -0700 |
| commit | e350bf7bdf2e734a7ac01a3715eeb4f159a866b1 (patch) | |
| tree | f686dc9f2485e73730dedf6731d03a4ada0d4e2d /indra/newview/llnearbychat.h | |
| parent | e3287fbe4cbb3ababe9b1d1be691ff4b90b45dd8 (diff) | |
| parent | b6b463dd3927148d1bb20f0bb9aa624ddaed15c4 (diff) | |
Pull from richard/viewer-experience
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; |