diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
commit | f22fc1e6129a7e56421a0777d69c64265d9ec4af (patch) | |
tree | 43dc78b1795ef407db7b9124472626fa77ae6621 /indra/newview/llnearbychat.h | |
parent | 847a3a12208359653aa7432f7f64c31669ec8963 (diff) | |
parent | e3344abb95802646912f357d214538966f3f2357 (diff) |
automated merge viewer2.0->viewer2.0
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(); |