diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 16:14:53 +0000 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-02 16:14:53 +0000 |
commit | 210fed642b5fe0d837b9dd84a8988d5f17bbd1c1 (patch) | |
tree | 7a0d53814b5955b7256eb33d7c1a6fd3fafb824a /indra/newview/llnearbychat.h | |
parent | 9a4d079b92d430cc86ddbee36efbd1ca58ddb986 (diff) | |
parent | 0a41542f2388a3b6142a15fef653b3e663e1dcc7 (diff) |
PE merge.
Diffstat (limited to 'indra/newview/llnearbychat.h')
-rw-r--r-- | indra/newview/llnearbychat.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llnearbychat.h b/indra/newview/llnearbychat.h index 5fb8ade19e..6ef2a1fee3 100644 --- a/indra/newview/llnearbychat.h +++ b/indra/newview/llnearbychat.h @@ -47,6 +47,8 @@ public: ~LLNearbyChat(); BOOL postBuild (); + + /** @param archive true - to save a message to the chat history log */ void addMessage (const LLChat& message,bool archive = true, const LLSD &args = LLSD()); void onNearbyChatContextMenuItemClicked(const LLSD& userdata); bool onNearbyChatCheckContextMenuItem(const LLSD& userdata); @@ -65,6 +67,10 @@ public: static void processChatHistoryStyleUpdate(const LLSD& newvalue); + void loadHistory(); + + static LLNearbyChat* getInstance(); + private: virtual void applySavedVariables(); |