aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llimview.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:16 -0500
committerJacek Antonelli2008-08-15 23:45:16 -0500
commit3f27ba891ac4d032753b219b4b96d1ffbc9fb488 (patch)
tree504932ee91a0356fba7ea48798887c96867e492f /linden/indra/newview/llimview.h
parentSecond Life viewer sources 1.18.4.3 (diff)
downloadmeta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.zip
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.gz
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.bz2
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.xz
Second Life viewer sources 1.18.5.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llimview.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 5f7829c..f5356ef 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -148,7 +148,13 @@ public:
148 static LLUUID computeSessionID(EInstantMessage dialog, const LLUUID& other_participant_id); 148 static LLUUID computeSessionID(EInstantMessage dialog, const LLUUID& other_participant_id);
149 149
150 void clearPendingVoiceInviation(const LLUUID& session_id); 150 void clearPendingVoiceInviation(const LLUUID& session_id);
151 151
152 LLSD getPendingAgentListUpdates(const LLUUID& session_id);
153 void addPendingAgentListUpdates(
154 const LLUUID& sessioN_id,
155 const LLSD& updates);
156 void clearPendingAgentListUpdates(const LLUUID& session_id);
157
152private: 158private:
153 class LLIMSessionInvite; 159 class LLIMSessionInvite;
154 160
@@ -188,6 +194,7 @@ private:
188 BOOL mIMReceived; 194 BOOL mIMReceived;
189 195
190 LLSD mPendingVoiceInvitations; 196 LLSD mPendingVoiceInvitations;
197 LLSD mPendingAgentListUpdates;
191}; 198};
192 199
193 200