aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-03 07:12:09 +0000
committerTeravus Ovares2008-06-03 07:12:09 +0000
commit61e2254be21b80b5b3934aa5a6e401b858b7fd8e (patch)
treee459093e30558837cec249349dfdc2e01d2c0972 /OpenSim/Region
parent* It's probably safe to remove the 'Warning Duplicate packet detected Packet ... (diff)
downloadopensim-SC_OLD-61e2254be21b80b5b3934aa5a6e401b858b7fd8e.zip
opensim-SC_OLD-61e2254be21b80b5b3934aa5a6e401b858b7fd8e.tar.gz
opensim-SC_OLD-61e2254be21b80b5b3934aa5a6e401b858b7fd8e.tar.bz2
opensim-SC_OLD-61e2254be21b80b5b3934aa5a6e401b858b7fd8e.tar.xz
* This should fix presence issues.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs9
2 files changed, 9 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b7f1d90..0ef7f26 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5981,6 +5981,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5981 onpb[i] = onpbl; 5981 onpb[i] = onpbl;
5982 } 5982 }
5983 onp.AgentBlock = onpb; 5983 onp.AgentBlock = onpb;
5984 onp.Header.Reliable = true;
5984 OutPacket(onp, ThrottleOutPacketType.Task); 5985 OutPacket(onp, ThrottleOutPacketType.Task);
5985 } 5986 }
5986 5987
@@ -5995,6 +5996,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5995 offpb[i] = onpbl; 5996 offpb[i] = onpbl;
5996 } 5997 }
5997 offp.AgentBlock = offpb; 5998 offp.AgentBlock = offpb;
5999 offp.Header.Reliable = true;
5998 OutPacket(offp, ThrottleOutPacketType.Task); 6000 OutPacket(offp, ThrottleOutPacketType.Task);
5999 } 6001 }
6000 6002
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 92c808b..0762291 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -93,8 +93,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
93 93
94 public XmlRpcResponse processPresenceUpdate(XmlRpcRequest req) 94 public XmlRpcResponse processPresenceUpdate(XmlRpcRequest req)
95 { 95 {
96 m_log.Info("[FRIENDS]: Got Notification about a user! OMG"); 96 //m_log.Info("[FRIENDS]: Got Notification about a user! OMG");
97 Hashtable requestData = (Hashtable)req.Params[0]; 97 Hashtable requestData = (Hashtable)req.Params[0];
98
98 if (requestData.ContainsKey("agent_id") && requestData.ContainsKey("notify_id") && requestData.ContainsKey("status")) 99 if (requestData.ContainsKey("agent_id") && requestData.ContainsKey("notify_id") && requestData.ContainsKey("status"))
99 { 100 {
100 LLUUID notifyAgentId = LLUUID.Zero; 101 LLUUID notifyAgentId = LLUUID.Zero;
@@ -107,7 +108,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
107 Helpers.TryParse((string)requestData["notify_id"], out notifyAgentId); 108 Helpers.TryParse((string)requestData["notify_id"], out notifyAgentId);
108 109
109 Helpers.TryParse((string)requestData["agent_id"], out notifyAboutAgentId); 110 Helpers.TryParse((string)requestData["agent_id"], out notifyAboutAgentId);
110 111 m_log.InfoFormat("[PRESENCE]: Got presence update for {0}, and we're telling {1}, with a status {2}", notifyAboutAgentId.ToString(), notifyAgentId.ToString(), notifyOnlineStatus.ToString());
111 ScenePresence avatar = GetPresenceFromAgentID(notifyAgentId); 112 ScenePresence avatar = GetPresenceFromAgentID(notifyAgentId);
112 if (avatar != null) 113 if (avatar != null)
113 { 114 {
@@ -161,6 +162,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
161 } 162 }
162 163
163 } 164 }
165 else
166 {
167 m_log.Warn("[PRESENCE]: Malformed XMLRPC Presence request");
168 }
164 return new XmlRpcResponse(); 169 return new XmlRpcResponse();
165 } 170 }
166 171