From ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 30 Apr 2009 13:04:20 -0500 Subject: Second Life viewer sources 1.23.0-RC --- linden/indra/newview/llimview.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'linden/indra/newview/llimview.h') diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h index 6b82c2e..a4e4196 100644 --- a/linden/indra/newview/llimview.h +++ b/linden/indra/newview/llimview.h @@ -17,7 +17,8 @@ * There are special exceptions to the terms and conditions of the GPL as * it is applied to this Source Code. View the full text of the exception * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception + * online at + * http://secondlifegrid.net/programs/open_source/licensing/flossexception * * By copying, modifying or distributing this software, you acknowledge * that you have read and understood your obligations described above, @@ -68,7 +69,7 @@ public: const LLVector3& position = LLVector3::zero, bool link_name = false); - void addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLStringUtil::format_map_t& args); + void addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args); // This method returns TRUE if the local viewer has a session // currently open keyed to the uuid. The uuid can be keyed by @@ -159,7 +160,7 @@ public: static LLUUID computeSessionID(EInstantMessage dialog, const LLUUID& other_participant_id); - void clearPendingInviation(const LLUUID& session_id); + void clearPendingInvitation(const LLUUID& session_id); LLSD getPendingAgentListUpdates(const LLUUID& session_id); void addPendingAgentListUpdates( @@ -171,8 +172,6 @@ public: const std::set >& getIMFloaterHandles() { return mFloaters; } private: - class LLIMSessionInvite; - // create a panel and update internal representation for // consistency. Returns the pointer, caller (the class instance // since it is a private method) is not responsible for deleting @@ -199,7 +198,6 @@ private: void processIMTypingCore(const LLIMInfo* im_info, BOOL typing); - static void inviteUserResponse(S32 option, void* user_data); static void onInviteNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* userdata); private: -- cgit v1.1