diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-29 19:19:42 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-08-29 19:19:42 -0700 |
| commit | 73eec0321f79bb7ceeb2b2027e63660158413e5e (patch) | |
| tree | e264a8962c34f0768bed34500d4af1af8a0eba27 /indra/newview/llnearbychat.h | |
| parent | be61b5be2f4089e12ca25ca1ece13bd0fdaea543 (diff) | |
| parent | 01a154809d650f7905aaa208150a1070b19e5c2b (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llnearbychat.h')
| -rw-r--r-- | indra/newview/llnearbychat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 7c58e3037e..379bfbee4b 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -35,17 +35,19 @@ #include "lloutputmonitorctrl.h" #include "llspeakers.h" #include "llscrollbar.h" +#include "llsingleton.h" #include "llviewerchat.h" #include "llpanel.h" class LLResizeBar; class LLNearbyChat - : public LLIMConversation + : public LLIMConversation, + public LLSingleton<LLNearbyChat> { public: // constructor for inline chat-bars (e.g. hosted in chat history window) - LLNearbyChat(const LLSD& key); + LLNearbyChat(const LLSD& key = LLSD()); ~LLNearbyChat() {} /*virtual*/ BOOL postBuild(); @@ -61,8 +63,6 @@ public: void reloadMessages(); void removeScreenChat(); - static LLNearbyChat* getInstance(); - void addToHost(); void show(); bool isChatVisible() const; |