aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llimview.h
diff options
context:
space:
mode:
authorJacek Antonelli2009-02-12 02:06:41 -0600
committerJacek Antonelli2009-02-12 02:06:45 -0600
commit61f97b33f9850d21965d397b947a298c16ba576d (patch)
treea2edff0a7fbc83e2259eda952511b0fbdbea290b /linden/indra/newview/llimview.h
parentSecond Life viewer sources 1.22.7-RC (diff)
downloadmeta-impy-61f97b33f9850d21965d397b947a298c16ba576d.zip
meta-impy-61f97b33f9850d21965d397b947a298c16ba576d.tar.gz
meta-impy-61f97b33f9850d21965d397b947a298c16ba576d.tar.bz2
meta-impy-61f97b33f9850d21965d397b947a298c16ba576d.tar.xz
Second Life viewer sources 1.22.8-RC
Diffstat (limited to 'linden/indra/newview/llimview.h')
-rw-r--r--linden/indra/newview/llimview.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index d28d00a..6b82c2e 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -97,7 +97,8 @@ public:
97 // Creates a P2P session with the requisite handle for responding to voice calls 97 // Creates a P2P session with the requisite handle for responding to voice calls
98 LLUUID addP2PSession(const std::string& name, 98 LLUUID addP2PSession(const std::string& name,
99 const LLUUID& other_participant_id, 99 const LLUUID& other_participant_id,
100 const std::string& voice_session_handle); 100 const std::string& voice_session_handle,
101 const std::string& caller_uri = LLStringUtil::null);
101 102
102 // This removes the panel referenced by the uuid, and then 103 // This removes the panel referenced by the uuid, and then
103 // restores internal consistency. The internal pointer is not 104 // restores internal consistency. The internal pointer is not
@@ -111,7 +112,8 @@ public:
111 const std::string& caller_name, 112 const std::string& caller_name,
112 EInstantMessage type, 113 EInstantMessage type,
113 EInvitationType inv_type, 114 EInvitationType inv_type,
114 const std::string& session_handle = LLStringUtil::null); 115 const std::string& session_handle = LLStringUtil::null,
116 const std::string& session_uri = LLStringUtil::null);
115 117
116 //Updates a given session's session IDs. Does not open, 118 //Updates a given session's session IDs. Does not open,
117 //create or do anything new. If the old session doesn't 119 //create or do anything new. If the old session doesn't