diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llimview.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h index 9046a2e..6b82c2e 100644 --- a/linden/indra/newview/llimview.h +++ b/linden/indra/newview/llimview.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2001&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2001-2008, Linden Research, Inc. | 7 | * Copyright (c) 2001-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -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 |