diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-03 17:48:01 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-03 17:48:01 -0700 |
| commit | 36df0f8a06629c5a14358c07d0f12ce1019f066e (patch) | |
| tree | 7cf7bbbaeb351b84888032ff98627b04fd871b60 /indra/newview/llnearbychat.h | |
| parent | 3d5e24d135bd5d2636f075f9ef12ffba2129c61f (diff) | |
| parent | 046e90a8f74f3c13107a7edc72e912799a5e62e9 (diff) | |
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
Diffstat (limited to 'indra/newview/llnearbychat.h')
| -rw-r--r-- | indra/newview/llnearbychat.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 648098113a..93168ba96a 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -45,9 +45,11 @@ class LLNearbyChat { public: // constructor for inline chat-bars (e.g. hosted in chat history window) - LLNearbyChat(const LLSD& key = LLSD()); + LLNearbyChat(const LLSD& key = LLSD(LLUUID())); ~LLNearbyChat() {} + static LLNearbyChat* buildFloater(const LLSD& key); + /*virtual*/ BOOL postBuild(); /*virtual*/ void onOpen(const LLSD& key); @@ -76,6 +78,8 @@ public: static void startChat(const char* line); static void stopChat(); + bool isHostSet(); + static void sendChatFromViewer(const std::string &utf8text, EChatType type, BOOL animate); static void sendChatFromViewer(const LLWString &wtext, EChatType type, BOOL animate); @@ -117,6 +121,7 @@ private: LLHandle<LLView> mPopupMenuHandle; std::vector<LLChat> mMessageArchive; + bool mIsHostSet; }; #endif |