aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/MessagingServer/MessageService.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Grid/MessagingServer/MessageService.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC_OLD-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
Diffstat (limited to 'OpenSim/Grid/MessagingServer/MessageService.cs')
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs40
1 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs
index dd6e445..1c5d334 100644
--- a/OpenSim/Grid/MessagingServer/MessageService.cs
+++ b/OpenSim/Grid/MessagingServer/MessageService.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Threading; 33using System.Threading;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Data; 37using OpenSim.Data;
@@ -206,11 +206,11 @@ namespace OpenSim.Grid.MessagingServer
206 /// </summary> 206 /// </summary>
207 /// <param name="agentID"></param> 207 /// <param name="agentID"></param>
208 /// <param name="friendID"></param> 208 /// <param name="friendID"></param>
209 public void addBackReference(LLUUID agentID, LLUUID friendID) 209 public void addBackReference(UUID agentID, UUID friendID)
210 { 210 {
211 if (m_presence_BackReferences.Contains(friendID)) 211 if (m_presence_BackReferences.Contains(friendID))
212 { 212 {
213 List<LLUUID> presenseBackReferences = (List<LLUUID>)m_presence_BackReferences[friendID]; 213 List<UUID> presenseBackReferences = (List<UUID>)m_presence_BackReferences[friendID];
214 if (!presenseBackReferences.Contains(agentID)) 214 if (!presenseBackReferences.Contains(agentID))
215 { 215 {
216 presenseBackReferences.Add(agentID); 216 presenseBackReferences.Add(agentID);
@@ -219,7 +219,7 @@ namespace OpenSim.Grid.MessagingServer
219 } 219 }
220 else 220 else
221 { 221 {
222 List<LLUUID> presenceBackReferences = new List<LLUUID>(); 222 List<UUID> presenceBackReferences = new List<UUID>();
223 presenceBackReferences.Add(agentID); 223 presenceBackReferences.Add(agentID);
224 m_presence_BackReferences[friendID] = presenceBackReferences; 224 m_presence_BackReferences[friendID] = presenceBackReferences;
225 } 225 }
@@ -230,11 +230,11 @@ namespace OpenSim.Grid.MessagingServer
230 /// </summary> 230 /// </summary>
231 /// <param name="agentID"></param> 231 /// <param name="agentID"></param>
232 /// <param name="friendID"></param> 232 /// <param name="friendID"></param>
233 public void removeBackReference(LLUUID agentID, LLUUID friendID) 233 public void removeBackReference(UUID agentID, UUID friendID)
234 { 234 {
235 if (m_presence_BackReferences.Contains(friendID)) 235 if (m_presence_BackReferences.Contains(friendID))
236 { 236 {
237 List<LLUUID> presenseBackReferences = (List<LLUUID>)m_presence_BackReferences[friendID]; 237 List<UUID> presenseBackReferences = (List<UUID>)m_presence_BackReferences[friendID];
238 if (presenseBackReferences.Contains(agentID)) 238 if (presenseBackReferences.Contains(agentID))
239 { 239 {
240 presenseBackReferences.Remove(agentID); 240 presenseBackReferences.Remove(agentID);
@@ -253,11 +253,11 @@ namespace OpenSim.Grid.MessagingServer
253 /// Logoff Processor. Call this to clean up agent presence data and send logoff presence notifications 253 /// Logoff Processor. Call this to clean up agent presence data and send logoff presence notifications
254 /// </summary> 254 /// </summary>
255 /// <param name="AgentID"></param> 255 /// <param name="AgentID"></param>
256 private void ProcessLogOff(LLUUID AgentID) 256 private void ProcessLogOff(UUID AgentID)
257 { 257 {
258 m_log.Info("[LOGOFF]: Processing Logoff"); 258 m_log.Info("[LOGOFF]: Processing Logoff");
259 UserPresenceData AgentData = null; 259 UserPresenceData AgentData = null;
260 List<LLUUID> AgentsNeedingNotification = new List<LLUUID>(); 260 List<UUID> AgentsNeedingNotification = new List<UUID>();
261 UserPresenceData friendd = null; 261 UserPresenceData friendd = null;
262 lock (m_presences) 262 lock (m_presences)
263 { 263 {
@@ -275,7 +275,7 @@ namespace OpenSim.Grid.MessagingServer
275 //{ 275 //{
276 //if (m_presence_BackReferences.Contains(AgentID)) 276 //if (m_presence_BackReferences.Contains(AgentID))
277 //{ 277 //{
278 //AgentsNeedingNotification = (List<LLUUID>)m_presence_BackReferences[AgentID]; 278 //AgentsNeedingNotification = (List<UUID>)m_presence_BackReferences[AgentID];
279 //} 279 //}
280 //} 280 //}
281 281
@@ -356,17 +356,17 @@ namespace OpenSim.Grid.MessagingServer
356 #region UserServer Comms 356 #region UserServer Comms
357 357
358 /// <summary> 358 /// <summary>
359 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner 359 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
360 /// </summary> 360 /// </summary>
361 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 361 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
362 public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 362 public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
363 { 363 {
364 List<FriendListItem> buddylist = new List<FriendListItem>(); 364 List<FriendListItem> buddylist = new List<FriendListItem>();
365 365
366 try 366 try
367 { 367 {
368 Hashtable param = new Hashtable(); 368 Hashtable param = new Hashtable();
369 param["ownerID"] = friendlistowner.UUID.ToString(); 369 param["ownerID"] = friendlistowner.ToString();
370 370
371 IList parameters = new ArrayList(); 371 IList parameters = new ArrayList();
372 parameters.Add(param); 372 parameters.Add(param);
@@ -403,8 +403,8 @@ namespace OpenSim.Grid.MessagingServer
403 { 403 {
404 FriendListItem buddylistitem = new FriendListItem(); 404 FriendListItem buddylistitem = new FriendListItem();
405 405
406 buddylistitem.FriendListOwner = new LLUUID((string)data["ownerID" + i.ToString()]); 406 buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);
407 buddylistitem.Friend = new LLUUID((string)data["friendID" + i.ToString()]); 407 buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);
408 buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]); 408 buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);
409 buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]); 409 buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);
410 410
@@ -438,11 +438,11 @@ namespace OpenSim.Grid.MessagingServer
438 //requestData["lastname"] = lastname; 438 //requestData["lastname"] = lastname;
439 439
440 AgentCircuitData agentData = new AgentCircuitData(); 440 AgentCircuitData agentData = new AgentCircuitData();
441 agentData.SessionID = new LLUUID((string)requestData["sessionid"]); 441 agentData.SessionID = new UUID((string)requestData["sessionid"]);
442 agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]); 442 agentData.SecureSessionID = new UUID((string)requestData["secure_session_id"]);
443 agentData.firstname = (string)requestData["firstname"]; 443 agentData.firstname = (string)requestData["firstname"];
444 agentData.lastname = (string)requestData["lastname"]; 444 agentData.lastname = (string)requestData["lastname"];
445 agentData.AgentID = new LLUUID((string)requestData["agentid"]); 445 agentData.AgentID = new UUID((string)requestData["agentid"]);
446 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); 446 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
447 agentData.CapsPath = (string)requestData["caps_path"]; 447 agentData.CapsPath = (string)requestData["caps_path"];
448 448
@@ -453,7 +453,7 @@ namespace OpenSim.Grid.MessagingServer
453 else 453 else
454 { 454 {
455 agentData.startpos = 455 agentData.startpos =
456 new LLVector3(Convert.ToUInt32(requestData["positionx"]), 456 new Vector3(Convert.ToUInt32(requestData["positionx"]),
457 Convert.ToUInt32(requestData["positiony"]), 457 Convert.ToUInt32(requestData["positiony"]),
458 Convert.ToUInt32(requestData["positionz"])); 458 Convert.ToUInt32(requestData["positionz"]));
459 agentData.child = false; 459 agentData.child = false;
@@ -485,7 +485,7 @@ namespace OpenSim.Grid.MessagingServer
485 m_log.Info("[USERLOGOFF]: User logged off called"); 485 m_log.Info("[USERLOGOFF]: User logged off called");
486 Hashtable requestData = (Hashtable)request.Params[0]; 486 Hashtable requestData = (Hashtable)request.Params[0];
487 487
488 LLUUID AgentID = new LLUUID((string)requestData["agentid"]); 488 UUID AgentID = new UUID((string)requestData["agentid"]);
489 489
490 ProcessLogOff(AgentID); 490 ProcessLogOff(AgentID);
491 491
@@ -598,7 +598,7 @@ namespace OpenSim.Grid.MessagingServer
598 regionProfile.regionLocY = regY; 598 regionProfile.regionLocY = regY;
599 599
600 regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]); 600 regionProfile.remotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
601 regionProfile.UUID = new LLUUID((string)responseData["region_UUID"]); 601 regionProfile.UUID = new UUID((string)responseData["region_UUID"]);
602 regionProfile.regionName = (string)responseData["region_name"]; 602 regionProfile.regionName = (string)responseData["region_name"];
603 lock (m_regionInfoCache) 603 lock (m_regionInfoCache)
604 { 604 {