aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/OGS1
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/Region/Communications/OGS1
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/Region/Communications/OGS1')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs74
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs34
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs18
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs32
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs82
5 files changed, 120 insertions, 120 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index da2e4a2..1dd4219 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -37,7 +37,7 @@ using System.Runtime.Remoting.Channels;
37using System.Runtime.Remoting.Channels.Tcp; 37using System.Runtime.Remoting.Channels.Tcp;
38using System.Security.Authentication; 38using System.Security.Authentication;
39using System.Threading; 39using System.Threading;
40using libsecondlife; 40using OpenMetaverse;
41using log4net; 41using log4net;
42using Nwc.XmlRpc; 42using Nwc.XmlRpc;
43using OpenSim.Framework; 43using OpenSim.Framework;
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Communications.OGS1
125 GridParams["server_uri"] = regionInfo.ServerURI; 125 GridParams["server_uri"] = regionInfo.ServerURI;
126 GridParams["region_secret"] = regionInfo.regionSecret; 126 GridParams["region_secret"] = regionInfo.regionSecret;
127 127
128 if (regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) 128 if (regionInfo.MasterAvatarAssignedUUID != UUID.Zero)
129 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); 129 GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
130 else 130 else
131 GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); 131 GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
@@ -275,7 +275,7 @@ namespace OpenSim.Region.Communications.OGS1
275 sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]); 275 sri.HttpPort = Convert.ToUInt32(neighbourData["http_port"]);
276 } 276 }
277 277
278 sri.RegionID = new LLUUID((string) neighbourData["uuid"]); 278 sri.RegionID = new UUID((string) neighbourData["uuid"]);
279 279
280 neighbours.Add(sri); 280 neighbours.Add(sri);
281 } 281 }
@@ -294,7 +294,7 @@ namespace OpenSim.Region.Communications.OGS1
294 /// FIXME: Might be nicer to return a proper exception here since we could inform the client more about the 294 /// FIXME: Might be nicer to return a proper exception here since we could inform the client more about the
295 /// nature of the faiulre. 295 /// nature of the faiulre.
296 /// </returns> 296 /// </returns>
297 public RegionInfo RequestNeighbourInfo(LLUUID Region_UUID) 297 public RegionInfo RequestNeighbourInfo(UUID Region_UUID)
298 { 298 {
299 RegionInfo regionInfo; 299 RegionInfo regionInfo;
300 Hashtable requestData = new Hashtable(); 300 Hashtable requestData = new Hashtable();
@@ -344,7 +344,7 @@ namespace OpenSim.Region.Communications.OGS1
344 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); 344 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
345 } 345 }
346 346
347 regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]); 347 regionInfo.RegionID = new UUID((string) responseData["region_UUID"]);
348 regionInfo.RegionName = (string) responseData["region_name"]; 348 regionInfo.RegionName = (string) responseData["region_name"];
349 349
350 if (requestData.ContainsKey("regionHandle")) 350 if (requestData.ContainsKey("regionHandle"))
@@ -407,7 +407,7 @@ namespace OpenSim.Region.Communications.OGS1
407 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); 407 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
408 } 408 }
409 409
410 regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]); 410 regionInfo.RegionID = new UUID((string) responseData["region_UUID"]);
411 regionInfo.RegionName = (string) responseData["region_name"]; 411 regionInfo.RegionName = (string) responseData["region_name"];
412 412
413 lock (m_remoteRegionInfoCache) 413 lock (m_remoteRegionInfoCache)
@@ -475,7 +475,7 @@ namespace OpenSim.Region.Communications.OGS1
475 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]); 475 regionInfo.HttpPort = Convert.ToUInt32((string) responseData["http_port"]);
476 } 476 }
477 477
478 regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]); 478 regionInfo.RegionID = new UUID((string) responseData["region_UUID"]);
479 regionInfo.RegionName = (string) responseData["region_name"]; 479 regionInfo.RegionName = (string) responseData["region_name"];
480 480
481 if (!m_remoteRegionInfoCache.ContainsKey(regionInfo.RegionHandle)) 481 if (!m_remoteRegionInfoCache.ContainsKey(regionInfo.RegionHandle))
@@ -533,7 +533,7 @@ namespace OpenSim.Region.Communications.OGS1
533 neighbour.Access = Convert.ToByte(n["access"]); 533 neighbour.Access = Convert.ToByte(n["access"]);
534 neighbour.RegionFlags = Convert.ToUInt32(n["region-flags"]); 534 neighbour.RegionFlags = Convert.ToUInt32(n["region-flags"]);
535 neighbour.WaterHeight = Convert.ToByte(n["water-height"]); 535 neighbour.WaterHeight = Convert.ToByte(n["water-height"]);
536 neighbour.MapImageId = new LLUUID((string) n["map-image-id"]); 536 neighbour.MapImageId = new UUID((string) n["map-image-id"]);
537 537
538 neighbours.Add(neighbour); 538 neighbours.Add(neighbour);
539 } 539 }
@@ -606,11 +606,11 @@ namespace OpenSim.Region.Communications.OGS1
606 m_log.Debug("[CONNECTION DEBUGGING]: Expect User called, starting agent setup ... "); 606 m_log.Debug("[CONNECTION DEBUGGING]: Expect User called, starting agent setup ... ");
607 Hashtable requestData = (Hashtable) request.Params[0]; 607 Hashtable requestData = (Hashtable) request.Params[0];
608 AgentCircuitData agentData = new AgentCircuitData(); 608 AgentCircuitData agentData = new AgentCircuitData();
609 agentData.SessionID = new LLUUID((string) requestData["session_id"]); 609 agentData.SessionID = new UUID((string) requestData["session_id"]);
610 agentData.SecureSessionID = new LLUUID((string) requestData["secure_session_id"]); 610 agentData.SecureSessionID = new UUID((string) requestData["secure_session_id"]);
611 agentData.firstname = (string) requestData["firstname"]; 611 agentData.firstname = (string) requestData["firstname"];
612 agentData.lastname = (string) requestData["lastname"]; 612 agentData.lastname = (string) requestData["lastname"];
613 agentData.AgentID = new LLUUID((string) requestData["agent_id"]); 613 agentData.AgentID = new UUID((string) requestData["agent_id"]);
614 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]); 614 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
615 agentData.CapsPath = (string) requestData["caps_path"]; 615 agentData.CapsPath = (string) requestData["caps_path"];
616 616
@@ -623,7 +623,7 @@ namespace OpenSim.Region.Communications.OGS1
623 { 623 {
624 m_log.Debug("[CONNECTION DEBUGGING]: Main agent detected"); 624 m_log.Debug("[CONNECTION DEBUGGING]: Main agent detected");
625 agentData.startpos = 625 agentData.startpos =
626 new LLVector3((float)Convert.ToDecimal((string)requestData["startpos_x"]), 626 new Vector3((float)Convert.ToDecimal((string)requestData["startpos_x"]),
627 (float)Convert.ToDecimal((string)requestData["startpos_y"]), 627 (float)Convert.ToDecimal((string)requestData["startpos_y"]),
628 (float)Convert.ToDecimal((string)requestData["startpos_z"])); 628 (float)Convert.ToDecimal((string)requestData["startpos_z"]));
629 agentData.child = false; 629 agentData.child = false;
@@ -684,10 +684,10 @@ namespace OpenSim.Region.Communications.OGS1
684 m_log.Debug("[CONNECTION DEBUGGING]: LogOff User Called "); 684 m_log.Debug("[CONNECTION DEBUGGING]: LogOff User Called ");
685 Hashtable requestData = (Hashtable)request.Params[0]; 685 Hashtable requestData = (Hashtable)request.Params[0];
686 string message = (string)requestData["message"]; 686 string message = (string)requestData["message"];
687 LLUUID agentID = LLUUID.Zero; 687 UUID agentID = UUID.Zero;
688 LLUUID RegionSecret = LLUUID.Zero; 688 UUID RegionSecret = UUID.Zero;
689 Helpers.TryParse((string)requestData["agent_id"], out agentID); 689 UUID.TryParse((string)requestData["agent_id"], out agentID);
690 Helpers.TryParse((string)requestData["region_secret"], out RegionSecret); 690 UUID.TryParse((string)requestData["region_secret"], out RegionSecret);
691 691
692 ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]); 692 ulong regionHandle = Convert.ToUInt64((string)requestData["regionhandle"]);
693 693
@@ -1072,7 +1072,7 @@ namespace OpenSim.Region.Communications.OGS1
1072 /// <param name="regionHandle"></param> 1072 /// <param name="regionHandle"></param>
1073 /// <param name="agentData"></param> 1073 /// <param name="agentData"></param>
1074 /// <returns></returns> 1074 /// <returns></returns>
1075 public bool InformRegionOfPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) 1075 public bool InformRegionOfPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod)
1076 { 1076 {
1077 int failures = 0; 1077 int failures = 0;
1078 lock (m_deadRegionCache) 1078 lock (m_deadRegionCache)
@@ -1106,7 +1106,7 @@ namespace OpenSim.Region.Communications.OGS1
1106 1106
1107 if (remObject != null) 1107 if (remObject != null)
1108 { 1108 {
1109 retValue = remObject.InformRegionOfPrimCrossing(regionHandle, primID.UUID, objData, XMLMethod); 1109 retValue = remObject.InformRegionOfPrimCrossing(regionHandle, primID.Guid, objData, XMLMethod);
1110 } 1110 }
1111 else 1111 else
1112 { 1112 {
@@ -1168,7 +1168,7 @@ namespace OpenSim.Region.Communications.OGS1
1168 /// <param name="agentID"></param> 1168 /// <param name="agentID"></param>
1169 /// <param name="position"></param> 1169 /// <param name="position"></param>
1170 /// <returns></returns> 1170 /// <returns></returns>
1171 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 1171 public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying)
1172 { 1172 {
1173 RegionInfo[] regions = m_regionsOnInstance.ToArray(); 1173 RegionInfo[] regions = m_regionsOnInstance.ToArray();
1174 bool banned = false; 1174 bool banned = false;
@@ -1212,7 +1212,7 @@ namespace OpenSim.Region.Communications.OGS1
1212 if (remObject != null) 1212 if (remObject != null)
1213 { 1213 {
1214 retValue = 1214 retValue =
1215 remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), 1215 remObject.ExpectAvatarCrossing(regionHandle, agentID.Guid, position,
1216 isFlying); 1216 isFlying);
1217 } 1217 }
1218 else 1218 else
@@ -1246,7 +1246,7 @@ namespace OpenSim.Region.Communications.OGS1
1246 } 1246 }
1247 } 1247 }
1248 1248
1249 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isPhysical) 1249 public bool ExpectPrimCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isPhysical)
1250 { 1250 {
1251 RegionInfo regInfo = null; 1251 RegionInfo regInfo = null;
1252 try 1252 try
@@ -1269,7 +1269,7 @@ namespace OpenSim.Region.Communications.OGS1
1269 if (remObject != null) 1269 if (remObject != null)
1270 { 1270 {
1271 retValue = 1271 retValue =
1272 remObject.ExpectAvatarCrossing(regionHandle, agentID.UUID, new sLLVector3(position), 1272 remObject.ExpectAvatarCrossing(regionHandle, agentID.Guid, position,
1273 isPhysical); 1273 isPhysical);
1274 } 1274 }
1275 else 1275 else
@@ -1322,7 +1322,7 @@ namespace OpenSim.Region.Communications.OGS1
1322 } 1322 }
1323 } 1323 }
1324 1324
1325 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 1325 public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID)
1326 { 1326 {
1327 RegionInfo regInfo = null; 1327 RegionInfo regInfo = null;
1328 try 1328 try
@@ -1345,7 +1345,7 @@ namespace OpenSim.Region.Communications.OGS1
1345 if (remObject != null) 1345 if (remObject != null)
1346 { 1346 {
1347 // retValue = 1347 // retValue =
1348 remObject.TellRegionToCloseChildConnection(regionHandle, agentID.UUID); 1348 remObject.TellRegionToCloseChildConnection(regionHandle, agentID.Guid);
1349 } 1349 }
1350 else 1350 else
1351 { 1351 {
@@ -1421,12 +1421,12 @@ namespace OpenSim.Region.Communications.OGS1
1421 } 1421 }
1422 } 1422 }
1423 1423
1424 public bool AcknowledgeAgentCrossed(ulong regionHandle, LLUUID agentId) 1424 public bool AcknowledgeAgentCrossed(ulong regionHandle, UUID agentId)
1425 { 1425 {
1426 return m_localBackend.AcknowledgeAgentCrossed(regionHandle, agentId); 1426 return m_localBackend.AcknowledgeAgentCrossed(regionHandle, agentId);
1427 } 1427 }
1428 1428
1429 public bool AcknowledgePrimCrossed(ulong regionHandle, LLUUID primId) 1429 public bool AcknowledgePrimCrossed(ulong regionHandle, UUID primId)
1430 { 1430 {
1431 return m_localBackend.AcknowledgePrimCrossed(regionHandle, primId); 1431 return m_localBackend.AcknowledgePrimCrossed(regionHandle, primId);
1432 } 1432 }
@@ -1509,7 +1509,7 @@ namespace OpenSim.Region.Communications.OGS1
1509 /// <param name="regionHandle"></param> 1509 /// <param name="regionHandle"></param>
1510 /// <param name="agentData"></param> 1510 /// <param name="agentData"></param>
1511 /// <returns></returns> 1511 /// <returns></returns>
1512 public bool IncomingPrim(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) 1512 public bool IncomingPrim(ulong regionHandle, UUID primID, string objData, int XMLMethod)
1513 { 1513 {
1514 // Is this necessary? 1514 // Is this necessary?
1515 try 1515 try
@@ -1532,7 +1532,7 @@ namespace OpenSim.Region.Communications.OGS1
1532 /// <param name="agentID"></param> 1532 /// <param name="agentID"></param>
1533 /// <param name="position"></param> 1533 /// <param name="position"></param>
1534 /// <returns></returns> 1534 /// <returns></returns>
1535 public bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 1535 public bool TriggerExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying)
1536 { 1536 {
1537 try 1537 try
1538 { 1538 {
@@ -1545,7 +1545,7 @@ namespace OpenSim.Region.Communications.OGS1
1545 } 1545 }
1546 } 1546 }
1547 1547
1548 public bool TriggerExpectPrimCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isPhysical) 1548 public bool TriggerExpectPrimCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isPhysical)
1549 { 1549 {
1550 try 1550 try
1551 { 1551 {
@@ -1558,7 +1558,7 @@ namespace OpenSim.Region.Communications.OGS1
1558 } 1558 }
1559 } 1559 }
1560 1560
1561 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 1561 public bool TriggerTellRegionToCloseChildConnection(ulong regionHandle, UUID agentID)
1562 { 1562 {
1563 try 1563 try
1564 { 1564 {
@@ -1692,18 +1692,18 @@ namespace OpenSim.Region.Communications.OGS1
1692 hash = (Hashtable)response.Value; 1692 hash = (Hashtable)response.Value;
1693 try { 1693 try {
1694 landData = new LandData(); 1694 landData = new LandData();
1695 landData.AABBMax = LLVector3.Parse((string)hash["AABBMax"]); 1695 landData.AABBMax = Vector3.Parse((string)hash["AABBMax"]);
1696 landData.AABBMin = LLVector3.Parse((string)hash["AABBMin"]); 1696 landData.AABBMin = Vector3.Parse((string)hash["AABBMin"]);
1697 landData.Area = Convert.ToInt32(hash["Area"]); 1697 landData.Area = Convert.ToInt32(hash["Area"]);
1698 landData.AuctionID = Convert.ToUInt32(hash["AuctionID"]); 1698 landData.AuctionID = Convert.ToUInt32(hash["AuctionID"]);
1699 landData.Description = (string)hash["Description"]; 1699 landData.Description = (string)hash["Description"];
1700 landData.Flags = Convert.ToUInt32(hash["Flags"]); 1700 landData.Flags = Convert.ToUInt32(hash["Flags"]);
1701 landData.GlobalID = new LLUUID((string)hash["GlobalID"]); 1701 landData.GlobalID = new UUID((string)hash["GlobalID"]);
1702 landData.Name = (string)hash["Name"]; 1702 landData.Name = (string)hash["Name"];
1703 landData.OwnerID = new LLUUID((string)hash["OwnerID"]); 1703 landData.OwnerID = new UUID((string)hash["OwnerID"]);
1704 landData.SalePrice = Convert.ToInt32(hash["SalePrice"]); 1704 landData.SalePrice = Convert.ToInt32(hash["SalePrice"]);
1705 landData.SnapshotID = new LLUUID((string)hash["SnapshotID"]); 1705 landData.SnapshotID = new UUID((string)hash["SnapshotID"]);
1706 landData.UserLocation = LLVector3.Parse((string)hash["UserLocation"]); 1706 landData.UserLocation = Vector3.Parse((string)hash["UserLocation"]);
1707 m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name); 1707 m_log.DebugFormat("[OGS1 GRID SERVICES] Got land data for parcel {0}", landData.Name);
1708 } 1708 }
1709 catch (Exception e) 1709 catch (Exception e)
@@ -1739,7 +1739,7 @@ namespace OpenSim.Region.Communications.OGS1
1739 if (landData != null) 1739 if (landData != null)
1740 { 1740 {
1741 // for now, only push out the data we need for answering a ParcelInfoReqeust 1741 // for now, only push out the data we need for answering a ParcelInfoReqeust
1742 // FIXME: these Replace calls are necessary as LLVector3.Parse can't parse vectors with spaces in them. Can be removed as soon as we switch to a newer version 1742 // FIXME: these Replace calls are necessary as Vector3.Parse can't parse vectors with spaces in them. Can be removed as soon as we switch to a newer version
1743 hash["AABBMax"] = landData.AABBMax.ToString().Replace(" ", ""); 1743 hash["AABBMax"] = landData.AABBMax.ToString().Replace(" ", "");
1744 hash["AABBMin"] = landData.AABBMin.ToString().Replace(" ", ""); 1744 hash["AABBMin"] = landData.AABBMin.ToString().Replace(" ", "");
1745 hash["Area"] = landData.Area.ToString(); 1745 hash["Area"] = landData.Area.ToString();
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
index 8285fb1..1f0c067 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InterSimComms.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using System.Runtime.Remoting; 30using System.Runtime.Remoting;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using OpenSim.Framework; 33using OpenSim.Framework;
34 34
@@ -36,17 +36,17 @@ namespace OpenSim.Region.Communications.OGS1
36{ 36{
37 public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData); 37 public delegate bool InformRegionChild(ulong regionHandle, AgentCircuitData agentData);
38 38
39 public delegate bool ExpectArrival(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); 39 public delegate bool ExpectArrival(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying);
40 40
41 public delegate bool InformRegionPrimGroup(ulong regionHandle, LLUUID primID, LLVector3 Positon, bool isPhysical); 41 public delegate bool InformRegionPrimGroup(ulong regionHandle, UUID primID, Vector3 Positon, bool isPhysical);
42 42
43 public delegate bool PrimGroupArrival(ulong regionHandle, LLUUID primID, string objData, int XMLMethod); 43 public delegate bool PrimGroupArrival(ulong regionHandle, UUID primID, string objData, int XMLMethod);
44 44
45 public delegate bool RegionUp(RegionUpData region, ulong regionhandle); 45 public delegate bool RegionUp(RegionUpData region, ulong regionhandle);
46 46
47 public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate); 47 public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate childUpdate);
48 48
49 public delegate bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID); 49 public delegate bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID);
50 50
51 public sealed class InterRegionSingleton 51 public sealed class InterRegionSingleton
52 { 52 {
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1
112 return false; 112 return false;
113 } 113 }
114 114
115 public bool ExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 115 public bool ExpectAvatarCrossing(ulong regionHandle, UUID agentID, Vector3 position, bool isFlying)
116 { 116 {
117 handlerArrival = OnArrival; 117 handlerArrival = OnArrival;
118 if (handlerArrival != null) 118 if (handlerArrival != null)
@@ -122,7 +122,7 @@ namespace OpenSim.Region.Communications.OGS1
122 return false; 122 return false;
123 } 123 }
124 124
125 public bool InformRegionPrim(ulong regionHandle, LLUUID primID, LLVector3 position, bool isPhysical) 125 public bool InformRegionPrim(ulong regionHandle, UUID primID, Vector3 position, bool isPhysical)
126 { 126 {
127 handlerPrimGroupNear = OnPrimGroupNear; 127 handlerPrimGroupNear = OnPrimGroupNear;
128 if (handlerPrimGroupNear != null) 128 if (handlerPrimGroupNear != null)
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Communications.OGS1
132 return false; 132 return false;
133 } 133 }
134 134
135 public bool ExpectPrimCrossing(ulong regionHandle, LLUUID primID, string objData, int XMLMethod) 135 public bool ExpectPrimCrossing(ulong regionHandle, UUID primID, string objData, int XMLMethod)
136 { 136 {
137 handlerPrimGroupArrival = OnPrimGroupArrival; 137 handlerPrimGroupArrival = OnPrimGroupArrival;
138 if (handlerPrimGroupArrival != null) 138 if (handlerPrimGroupArrival != null)
@@ -142,7 +142,7 @@ namespace OpenSim.Region.Communications.OGS1
142 return false; 142 return false;
143 } 143 }
144 144
145 public bool TellRegionToCloseChildConnection(ulong regionHandle, LLUUID agentID) 145 public bool TellRegionToCloseChildConnection(ulong regionHandle, UUID agentID)
146 { 146 {
147 handlerTellRegionToCloseChildConnection = OnTellRegionToCloseChildConnection; 147 handlerTellRegionToCloseChildConnection = OnTellRegionToCloseChildConnection;
148 if (handlerTellRegionToCloseChildConnection != null) 148 if (handlerTellRegionToCloseChildConnection != null)
@@ -202,13 +202,13 @@ namespace OpenSim.Region.Communications.OGS1
202 } 202 }
203 203
204 204
205 public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, sLLVector3 position, bool isFlying) 205 public bool ExpectAvatarCrossing(ulong regionHandle, Guid agentID, Vector3 position, bool isFlying)
206 { 206 {
207 try 207 try
208 { 208 {
209 return 209 return
210 InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new LLUUID(agentID), 210 InterRegionSingleton.Instance.ExpectAvatarCrossing(regionHandle, new UUID(agentID),
211 new LLVector3(position.x, position.y, position.z), 211 position,
212 isFlying); 212 isFlying);
213 } 213 }
214 catch (RemotingException e) 214 catch (RemotingException e)
@@ -218,13 +218,13 @@ namespace OpenSim.Region.Communications.OGS1
218 } 218 }
219 } 219 }
220 220
221 public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, sLLVector3 position, bool isPhysical) 221 public bool InformRegionPrim(ulong regionHandle, Guid SceneObjectGroupID, Vector3 position, bool isPhysical)
222 { 222 {
223 try 223 try
224 { 224 {
225 return 225 return
226 InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new LLUUID(SceneObjectGroupID), 226 InterRegionSingleton.Instance.InformRegionPrim(regionHandle, new UUID(SceneObjectGroupID),
227 new LLVector3(position.x, position.y, position.z), 227 position,
228 isPhysical); 228 isPhysical);
229 } 229 }
230 catch (RemotingException e) 230 catch (RemotingException e)
@@ -238,7 +238,7 @@ namespace OpenSim.Region.Communications.OGS1
238 { 238 {
239 try 239 try
240 { 240 {
241 return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new LLUUID(primID), objData, XMLMethod); 241 return InterRegionSingleton.Instance.ExpectPrimCrossing(regionHandle, new UUID(primID), objData, XMLMethod);
242 } 242 }
243 catch (RemotingException e) 243 catch (RemotingException e)
244 { 244 {
@@ -251,7 +251,7 @@ namespace OpenSim.Region.Communications.OGS1
251 { 251 {
252 try 252 try
253 { 253 {
254 return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new LLUUID(agentID)); 254 return InterRegionSingleton.Instance.TellRegionToCloseChildConnection(regionHandle, new UUID(agentID));
255 } 255 }
256 catch (RemotingException) 256 catch (RemotingException)
257 { 257 {
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
index 2828928..b9e8394 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
@@ -46,8 +46,8 @@ namespace OpenSim.Region.Communications.OGS1
46 46
47 private string _inventoryServerUrl; 47 private string _inventoryServerUrl;
48 private Uri m_Uri; 48 private Uri m_Uri;
49 private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory 49 private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory
50 = new Dictionary<LLUUID, InventoryReceiptCallback>(); 50 = new Dictionary<UUID, InventoryReceiptCallback>();
51 51
52 public OGS1InventoryService(string inventoryServerUrl) 52 public OGS1InventoryService(string inventoryServerUrl)
53 { 53 {
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Communications.OGS1
67 /// </summary> 67 /// </summary>
68 /// <param name="userID"></param> 68 /// <param name="userID"></param>
69 /// <param name="callback"></param> 69 /// <param name="callback"></param>
70 public void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 70 public void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback)
71 { 71 {
72 if (!m_RequestingInventory.ContainsKey(userID)) 72 if (!m_RequestingInventory.ContainsKey(userID))
73 { 73 {
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Communications.OGS1
83 = new RestObjectPosterResponse<InventoryCollection>(); 83 = new RestObjectPosterResponse<InventoryCollection>();
84 requester.ResponseCallback = InventoryResponse; 84 requester.ResponseCallback = InventoryResponse;
85 85
86 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.UUID); 86 requester.BeginPostObject<Guid>(_inventoryServerUrl + "/GetInventory/", userID.Guid);
87 } 87 }
88 catch (WebException e) 88 catch (WebException e)
89 { 89 {
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Communications.OGS1
106 /// <param name="userID"></param> 106 /// <param name="userID"></param>
107 private void InventoryResponse(InventoryCollection response) 107 private void InventoryResponse(InventoryCollection response)
108 { 108 {
109 LLUUID userID = response.UserID; 109 UUID userID = response.UserID;
110 if (m_RequestingInventory.ContainsKey(userID)) 110 if (m_RequestingInventory.ContainsKey(userID))
111 { 111 {
112 m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + 112 m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " +
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Communications.OGS1
121 121
122 foreach (InventoryFolderBase folder in response.Folders) 122 foreach (InventoryFolderBase folder in response.Folders)
123 { 123 {
124 if (folder.ParentID == LLUUID.Zero) 124 if (folder.ParentID == UUID.Zero)
125 { 125 {
126 rootFolder = new InventoryFolderImpl(folder); 126 rootFolder = new InventoryFolderImpl(folder);
127 folders.Add(rootFolder); 127 folders.Add(rootFolder);
@@ -296,12 +296,12 @@ namespace OpenSim.Region.Communications.OGS1
296 return false; 296 return false;
297 } 297 }
298 298
299 public bool HasInventoryForUser(LLUUID userID) 299 public bool HasInventoryForUser(UUID userID)
300 { 300 {
301 return false; 301 return false;
302 } 302 }
303 303
304 public InventoryFolderBase RequestRootFolder(LLUUID userID) 304 public InventoryFolderBase RequestRootFolder(UUID userID)
305 { 305 {
306 return null; 306 return null;
307 } 307 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
index 26521ab..c690def 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1SecureInventoryService.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications; 35using OpenSim.Framework.Communications;
@@ -46,8 +46,8 @@ namespace OpenSim.Region.Communications.OGS1
46 46
47 private string _inventoryServerUrl; 47 private string _inventoryServerUrl;
48 private Uri m_Uri; 48 private Uri m_Uri;
49 private Dictionary<LLUUID, InventoryReceiptCallback> m_RequestingInventory 49 private Dictionary<UUID, InventoryReceiptCallback> m_RequestingInventory
50 = new Dictionary<LLUUID, InventoryReceiptCallback>(); 50 = new Dictionary<UUID, InventoryReceiptCallback>();
51 51
52 public OGS1SecureInventoryService(string inventoryServerUrl) 52 public OGS1SecureInventoryService(string inventoryServerUrl)
53 { 53 {
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Communications.OGS1
67 /// </summary> 67 /// </summary>
68 /// <param name="userID"></param> 68 /// <param name="userID"></param>
69 /// <param name="callback"></param> 69 /// <param name="callback"></param>
70 public void RequestInventoryForUser(LLUUID userID, LLUUID session_id, InventoryReceiptCallback callback) 70 public void RequestInventoryForUser(UUID userID, UUID session_id, InventoryReceiptCallback callback)
71 { 71 {
72 if (!m_RequestingInventory.ContainsKey(userID)) 72 if (!m_RequestingInventory.ContainsKey(userID))
73 { 73 {
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Communications.OGS1
83 = new RestSessionObjectPosterResponse<Guid, InventoryCollection>(); 83 = new RestSessionObjectPosterResponse<Guid, InventoryCollection>();
84 requester.ResponseCallback = InventoryResponse; 84 requester.ResponseCallback = InventoryResponse;
85 85
86 requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.UUID, session_id.ToString(), userID.ToString()); 86 requester.BeginPostObject(_inventoryServerUrl + "/GetInventory/", userID.Guid, session_id.ToString(), userID.ToString());
87 } 87 }
88 catch (WebException e) 88 catch (WebException e)
89 { 89 {
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Communications.OGS1
106 /// <param name="userID"></param> 106 /// <param name="userID"></param>
107 private void InventoryResponse(InventoryCollection response) 107 private void InventoryResponse(InventoryCollection response)
108 { 108 {
109 LLUUID userID = response.UserID; 109 UUID userID = response.UserID;
110 if (m_RequestingInventory.ContainsKey(userID)) 110 if (m_RequestingInventory.ContainsKey(userID))
111 { 111 {
112 m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " + 112 m_log.InfoFormat("[OGS1 INVENTORY SERVICE]: " +
@@ -121,7 +121,7 @@ namespace OpenSim.Region.Communications.OGS1
121 121
122 foreach (InventoryFolderBase folder in response.Folders) 122 foreach (InventoryFolderBase folder in response.Folders)
123 { 123 {
124 if (folder.ParentID == LLUUID.Zero) 124 if (folder.ParentID == UUID.Zero)
125 { 125 {
126 rootFolder = new InventoryFolderImpl(folder); 126 rootFolder = new InventoryFolderImpl(folder);
127 folders.Add(rootFolder); 127 folders.Add(rootFolder);
@@ -166,7 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
166 /// <summary> 166 /// <summary>
167 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 167 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
168 /// </summary> 168 /// </summary>
169 public bool AddFolder(InventoryFolderBase folder, LLUUID session_id) 169 public bool AddFolder(InventoryFolderBase folder, UUID session_id)
170 { 170 {
171 try 171 try
172 { 172 {
@@ -186,7 +186,7 @@ namespace OpenSim.Region.Communications.OGS1
186 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 186 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
187 /// </summary> 187 /// </summary>
188 /// <param name="folder"></param> 188 /// <param name="folder"></param>
189 public bool UpdateFolder(InventoryFolderBase folder, LLUUID session_id) 189 public bool UpdateFolder(InventoryFolderBase folder, UUID session_id)
190 { 190 {
191 try 191 try
192 { 192 {
@@ -206,7 +206,7 @@ namespace OpenSim.Region.Communications.OGS1
206 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 206 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
207 /// </summary> 207 /// </summary>
208 /// <param name="folder"></param> 208 /// <param name="folder"></param>
209 public bool MoveFolder(InventoryFolderBase folder, LLUUID session_id) 209 public bool MoveFolder(InventoryFolderBase folder, UUID session_id)
210 { 210 {
211 try 211 try
212 { 212 {
@@ -225,7 +225,7 @@ namespace OpenSim.Region.Communications.OGS1
225 /// <summary> 225 /// <summary>
226 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 226 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
227 /// </summary> 227 /// </summary>
228 public bool PurgeFolder(InventoryFolderBase folder, LLUUID session_id) 228 public bool PurgeFolder(InventoryFolderBase folder, UUID session_id)
229 { 229 {
230 try 230 try
231 { 231 {
@@ -244,7 +244,7 @@ namespace OpenSim.Region.Communications.OGS1
244 /// <summary> 244 /// <summary>
245 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 245 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
246 /// </summary> 246 /// </summary>
247 public bool AddItem(InventoryItemBase item, LLUUID session_id) 247 public bool AddItem(InventoryItemBase item, UUID session_id)
248 { 248 {
249 try 249 try
250 { 250 {
@@ -261,7 +261,7 @@ namespace OpenSim.Region.Communications.OGS1
261 } 261 }
262 262
263 // TODO: this is a temporary workaround, the UpdateInventoryItem method need to be implemented 263 // TODO: this is a temporary workaround, the UpdateInventoryItem method need to be implemented
264 public bool UpdateItem(InventoryItemBase item, LLUUID session_id) 264 public bool UpdateItem(InventoryItemBase item, UUID session_id)
265 { 265 {
266 try 266 try
267 { 267 {
@@ -280,7 +280,7 @@ namespace OpenSim.Region.Communications.OGS1
280 /// <summary> 280 /// <summary>
281 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see> 281 /// <see cref="OpenSim.Framework.Communications.IInventoryServices"></see>
282 /// </summary> 282 /// </summary>
283 public bool DeleteItem(InventoryItemBase item, LLUUID session_id) 283 public bool DeleteItem(InventoryItemBase item, UUID session_id)
284 { 284 {
285 try 285 try
286 { 286 {
@@ -296,12 +296,12 @@ namespace OpenSim.Region.Communications.OGS1
296 return false; 296 return false;
297 } 297 }
298 298
299 public bool HasInventoryForUser(LLUUID userID) 299 public bool HasInventoryForUser(UUID userID)
300 { 300 {
301 return false; 301 return false;
302 } 302 }
303 303
304 public InventoryFolderBase RequestRootFolder(LLUUID userID) 304 public InventoryFolderBase RequestRootFolder(UUID userID)
305 { 305 {
306 return null; 306 return null;
307 } 307 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 2223aeb..317be13 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using Nwc.XmlRpc; 36using Nwc.XmlRpc;
37using OpenSim.Framework; 37using OpenSim.Framework;
@@ -64,27 +64,27 @@ namespace OpenSim.Region.Communications.OGS1
64 UserProfileData userData = new UserProfileData(); 64 UserProfileData userData = new UserProfileData();
65 userData.FirstName = (string) data["firstname"]; 65 userData.FirstName = (string) data["firstname"];
66 userData.SurName = (string) data["lastname"]; 66 userData.SurName = (string) data["lastname"];
67 userData.ID = new LLUUID((string) data["uuid"]); 67 userData.ID = new UUID((string) data["uuid"]);
68 userData.UserInventoryURI = (string) data["server_inventory"]; 68 userData.UserInventoryURI = (string) data["server_inventory"];
69 userData.UserAssetURI = (string) data["server_asset"]; 69 userData.UserAssetURI = (string) data["server_asset"];
70 userData.FirstLifeAboutText = (string) data["profile_firstlife_about"]; 70 userData.FirstLifeAboutText = (string) data["profile_firstlife_about"];
71 userData.FirstLifeImage = new LLUUID((string) data["profile_firstlife_image"]); 71 userData.FirstLifeImage = new UUID((string) data["profile_firstlife_image"]);
72 userData.CanDoMask = Convert.ToUInt32((string) data["profile_can_do"]); 72 userData.CanDoMask = Convert.ToUInt32((string) data["profile_can_do"]);
73 userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]); 73 userData.WantDoMask = Convert.ToUInt32(data["profile_want_do"]);
74 userData.AboutText = (string)data["profile_about"]; 74 userData.AboutText = (string)data["profile_about"];
75 userData.Image = new LLUUID((string) data["profile_image"]); 75 userData.Image = new UUID((string) data["profile_image"]);
76 userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); 76 userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]);
77 userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); 77 userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]);
78 if (data.Contains("home_region_id")) 78 if (data.Contains("home_region_id"))
79 userData.HomeRegionID = new LLUUID((string)data["home_region_id"]); 79 userData.HomeRegionID = new UUID((string)data["home_region_id"]);
80 else 80 else
81 userData.HomeRegionID = LLUUID.Zero; 81 userData.HomeRegionID = UUID.Zero;
82 userData.HomeLocation = 82 userData.HomeLocation =
83 new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), 83 new Vector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]),
84 (float) Convert.ToDecimal((string) data["home_coordinates_y"]), 84 (float) Convert.ToDecimal((string) data["home_coordinates_y"]),
85 (float) Convert.ToDecimal((string) data["home_coordinates_z"])); 85 (float) Convert.ToDecimal((string) data["home_coordinates_z"]));
86 userData.HomeLookAt = 86 userData.HomeLookAt =
87 new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]), 87 new Vector3((float) Convert.ToDecimal((string) data["home_look_x"]),
88 (float) Convert.ToDecimal((string) data["home_look_y"]), 88 (float) Convert.ToDecimal((string) data["home_look_y"]),
89 (float) Convert.ToDecimal((string) data["home_look_z"])); 89 (float) Convert.ToDecimal((string) data["home_look_z"]));
90 if (data.Contains("user_flags")) 90 if (data.Contains("user_flags"))
@@ -100,9 +100,9 @@ namespace OpenSim.Region.Communications.OGS1
100 userData.CustomType = ""; 100 userData.CustomType = "";
101 101
102 if (data.Contains("partner")) 102 if (data.Contains("partner"))
103 userData.Partner = new LLUUID((string) data["partner"]); 103 userData.Partner = new UUID((string) data["partner"]);
104 else 104 else
105 userData.Partner = LLUUID.Zero; 105 userData.Partner = UUID.Zero;
106 106
107 return userData; 107 return userData;
108 } 108 }
@@ -112,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1
112 /// </summary> 112 /// </summary>
113 /// <param name="avatarID"></param> 113 /// <param name="avatarID"></param>
114 /// <returns>null if the request fails</returns> 114 /// <returns>null if the request fails</returns>
115 public UserAgentData GetAgentByUUID(LLUUID userId) 115 public UserAgentData GetAgentByUUID(UUID userId)
116 { 116 {
117 try 117 try
118 { 118 {
@@ -131,11 +131,11 @@ namespace OpenSim.Region.Communications.OGS1
131 "): " + (string)respData["error_desc"]); 131 "): " + (string)respData["error_desc"]);
132 return null; 132 return null;
133 } 133 }
134 LLUUID sessionid = LLUUID.Zero; 134 UUID sessionid = UUID.Zero;
135 135
136 UserAgentData userAgent = new UserAgentData(); 136 UserAgentData userAgent = new UserAgentData();
137 userAgent.Handle = Convert.ToUInt64((string)respData["handle"]); 137 userAgent.Handle = Convert.ToUInt64((string)respData["handle"]);
138 Helpers.TryParse((string)respData["sessionid"], out sessionid); 138 UUID.TryParse((string)respData["sessionid"], out sessionid);
139 userAgent.SessionID = sessionid; 139 userAgent.SessionID = sessionid;
140 140
141 if ((string)respData["agent_online"] == "TRUE") 141 if ((string)respData["agent_online"] == "TRUE")
@@ -183,17 +183,17 @@ namespace OpenSim.Region.Communications.OGS1
183 } 183 }
184 } 184 }
185 185
186 public List<AvatarPickerAvatar> ConvertXMLRPCDataToAvatarPickerList(LLUUID queryID, Hashtable data) 186 public List<AvatarPickerAvatar> ConvertXMLRPCDataToAvatarPickerList(UUID queryID, Hashtable data)
187 { 187 {
188 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); 188 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
189 int pickercount = Convert.ToInt32((string) data["avcount"]); 189 int pickercount = Convert.ToInt32((string) data["avcount"]);
190 LLUUID respqueryID = new LLUUID((string) data["queryid"]); 190 UUID respqueryID = new UUID((string) data["queryid"]);
191 if (queryID == respqueryID) 191 if (queryID == respqueryID)
192 { 192 {
193 for (int i = 0; i < pickercount; i++) 193 for (int i = 0; i < pickercount; i++)
194 { 194 {
195 AvatarPickerAvatar apicker = new AvatarPickerAvatar(); 195 AvatarPickerAvatar apicker = new AvatarPickerAvatar();
196 LLUUID avatarID = new LLUUID((string) data["avatarid" + i.ToString()]); 196 UUID avatarID = new UUID((string) data["avatarid" + i.ToString()]);
197 string firstname = (string) data["firstname" + i.ToString()]; 197 string firstname = (string) data["firstname" + i.ToString()];
198 string lastname = (string) data["lastname" + i.ToString()]; 198 string lastname = (string) data["lastname" + i.ToString()];
199 apicker.AvatarID = avatarID; 199 apicker.AvatarID = avatarID;
@@ -219,8 +219,8 @@ namespace OpenSim.Region.Communications.OGS1
219 { 219 {
220 FriendListItem buddylistitem = new FriendListItem(); 220 FriendListItem buddylistitem = new FriendListItem();
221 221
222 buddylistitem.FriendListOwner = new LLUUID((string)data["ownerID" + i.ToString()]); 222 buddylistitem.FriendListOwner = new UUID((string)data["ownerID" + i.ToString()]);
223 buddylistitem.Friend = new LLUUID((string)data["friendID" + i.ToString()]); 223 buddylistitem.Friend = new UUID((string)data["friendID" + i.ToString()]);
224 buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]); 224 buddylistitem.FriendListOwnerPerms = (uint)Convert.ToInt32((string)data["ownerPerms" + i.ToString()]);
225 buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]); 225 buddylistitem.FriendPerms = (uint)Convert.ToInt32((string)data["friendPerms" + i.ToString()]);
226 226
@@ -239,11 +239,11 @@ namespace OpenSim.Region.Communications.OGS1
239 /// <param name="posx">final position x</param> 239 /// <param name="posx">final position x</param>
240 /// <param name="posy">final position y</param> 240 /// <param name="posy">final position y</param>
241 /// <param name="posz">final position z</param> 241 /// <param name="posz">final position z</param>
242 public void LogOffUser(LLUUID userid, LLUUID regionid, ulong regionhandle, float posx, float posy, float posz) 242 public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
243 { 243 {
244 Hashtable param = new Hashtable(); 244 Hashtable param = new Hashtable();
245 param["avatar_uuid"] = userid.UUID.ToString(); 245 param["avatar_uuid"] = userid.ToString();
246 param["region_uuid"] = regionid.UUID.ToString(); 246 param["region_uuid"] = regionid.ToString();
247 param["region_handle"] = regionhandle.ToString(); 247 param["region_handle"] = regionhandle.ToString();
248 param["region_pos_x"] = posx.ToString(); 248 param["region_pos_x"] = posx.ToString();
249 param["region_pos_y"] = posy.ToString(); 249 param["region_pos_y"] = posy.ToString();
@@ -268,7 +268,7 @@ namespace OpenSim.Region.Communications.OGS1
268 return GetUserProfile(firstName + " " + lastName); 268 return GetUserProfile(firstName + " " + lastName);
269 } 269 }
270 270
271 public void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) 271 public void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle)
272 { 272 {
273 Hashtable param = new Hashtable(); 273 Hashtable param = new Hashtable();
274 param.Add("avatar_id", avatarid.ToString()); 274 param.Add("avatar_id", avatarid.ToString());
@@ -320,7 +320,7 @@ namespace OpenSim.Region.Communications.OGS1
320 } 320 }
321 } 321 }
322 322
323 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) 323 public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
324 { 324 {
325 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>(); 325 List<AvatarPickerAvatar> pickerlist = new List<AvatarPickerAvatar>();
326 Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9 ]"); 326 Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9 ]");
@@ -379,7 +379,7 @@ namespace OpenSim.Region.Communications.OGS1
379 /// </summary> 379 /// </summary>
380 /// <param name="avatarID"></param> 380 /// <param name="avatarID"></param>
381 /// <returns>null if the request fails</returns> 381 /// <returns>null if the request fails</returns>
382 public UserProfileData GetUserProfile(LLUUID avatarID) 382 public UserProfileData GetUserProfile(UUID avatarID)
383 { 383 {
384 try 384 try
385 { 385 {
@@ -404,7 +404,7 @@ namespace OpenSim.Region.Communications.OGS1
404 } 404 }
405 405
406 406
407 public void ClearUserAgent(LLUUID avatarID) 407 public void ClearUserAgent(UUID avatarID)
408 { 408 {
409 // TODO: implement 409 // TODO: implement
410 } 410 }
@@ -435,7 +435,7 @@ namespace OpenSim.Region.Communications.OGS1
435 /// </summary> 435 /// </summary>
436 /// <param name="uuid"></param> 436 /// <param name="uuid"></param>
437 /// <returns></returns> 437 /// <returns></returns>
438 public UserProfileData SetupMasterUser(LLUUID uuid) 438 public UserProfileData SetupMasterUser(UUID uuid)
439 { 439 {
440 UserProfileData data = GetUserProfile(uuid); 440 UserProfileData data = GetUserProfile(uuid);
441 441
@@ -448,7 +448,7 @@ namespace OpenSim.Region.Communications.OGS1
448 return data; 448 return data;
449 } 449 }
450 450
451 public LLUUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY) 451 public UUID AddUserProfile(string firstName, string lastName, string pass, uint regX, uint regY)
452 { 452 {
453 throw new Exception("The method or operation is not implemented."); 453 throw new Exception("The method or operation is not implemented.");
454 } 454 }
@@ -523,13 +523,13 @@ namespace OpenSim.Region.Communications.OGS1
523 /// <param name="friendlistowner">The agent that who's friends list is being added to</param> 523 /// <param name="friendlistowner">The agent that who's friends list is being added to</param>
524 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param> 524 /// <param name="friend">The agent that being added to the friends list of the friends list owner</param>
525 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> 525 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
526 public void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) 526 public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
527 { 527 {
528 try 528 try
529 { 529 {
530 Hashtable param = new Hashtable(); 530 Hashtable param = new Hashtable();
531 param["ownerID"] = friendlistowner.UUID.ToString(); 531 param["ownerID"] = friendlistowner.ToString();
532 param["friendID"] = friend.UUID.ToString(); 532 param["friendID"] = friend.ToString();
533 param["friendPerms"] = perms.ToString(); 533 param["friendPerms"] = perms.ToString();
534 IList parameters = new ArrayList(); 534 IList parameters = new ArrayList();
535 parameters.Add(param); 535 parameters.Add(param);
@@ -575,13 +575,13 @@ namespace OpenSim.Region.Communications.OGS1
575 /// </summary> 575 /// </summary>
576 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 576 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
577 /// <param name="friend">The Ex-friend agent</param> 577 /// <param name="friend">The Ex-friend agent</param>
578 public void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) 578 public void RemoveUserFriend(UUID friendlistowner, UUID friend)
579 { 579 {
580 try 580 try
581 { 581 {
582 Hashtable param = new Hashtable(); 582 Hashtable param = new Hashtable();
583 param["ownerID"] = friendlistowner.UUID.ToString(); 583 param["ownerID"] = friendlistowner.ToString();
584 param["friendID"] = friend.UUID.ToString(); 584 param["friendID"] = friend.ToString();
585 585
586 IList parameters = new ArrayList(); 586 IList parameters = new ArrayList();
587 parameters.Add(param); 587 parameters.Add(param);
@@ -627,13 +627,13 @@ namespace OpenSim.Region.Communications.OGS1
627 /// <param name="friendlistowner">The agent that who's friends list is being updated</param> 627 /// <param name="friendlistowner">The agent that who's friends list is being updated</param>
628 /// <param name="friend">The agent that is getting or loosing permissions</param> 628 /// <param name="friend">The agent that is getting or loosing permissions</param>
629 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param> 629 /// <param name="perms">A uint bit vector for set perms that the friend being added has; 0 = none, 1=This friend can see when they sign on, 2 = map, 4 edit objects </param>
630 public void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) 630 public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
631 { 631 {
632 try 632 try
633 { 633 {
634 Hashtable param = new Hashtable(); 634 Hashtable param = new Hashtable();
635 param["ownerID"] = friendlistowner.UUID.ToString(); 635 param["ownerID"] = friendlistowner.ToString();
636 param["friendID"] = friend.UUID.ToString(); 636 param["friendID"] = friend.ToString();
637 param["friendPerms"] = perms.ToString(); 637 param["friendPerms"] = perms.ToString();
638 IList parameters = new ArrayList(); 638 IList parameters = new ArrayList();
639 parameters.Add(param); 639 parameters.Add(param);
@@ -672,17 +672,17 @@ namespace OpenSim.Region.Communications.OGS1
672 } 672 }
673 } 673 }
674 /// <summary> 674 /// <summary>
675 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for LLUUID friendslistowner 675 /// Returns a list of FriendsListItems that describe the friends and permissions in the friend relationship for UUID friendslistowner
676 /// </summary> 676 /// </summary>
677 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 677 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
678 public List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) 678 public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
679 { 679 {
680 List<FriendListItem> buddylist = new List<FriendListItem>(); 680 List<FriendListItem> buddylist = new List<FriendListItem>();
681 681
682 try 682 try
683 { 683 {
684 Hashtable param = new Hashtable(); 684 Hashtable param = new Hashtable();
685 param["ownerID"] = friendlistowner.UUID.ToString(); 685 param["ownerID"] = friendlistowner.ToString();
686 686
687 IList parameters = new ArrayList(); 687 IList parameters = new ArrayList();
688 parameters.Add(param); 688 parameters.Add(param);
@@ -708,7 +708,7 @@ namespace OpenSim.Region.Communications.OGS1
708 #endregion 708 #endregion
709 709
710 /// Appearance 710 /// Appearance
711 public AvatarAppearance GetUserAppearance(LLUUID user) 711 public AvatarAppearance GetUserAppearance(UUID user)
712 { 712 {
713 AvatarAppearance appearance = null; 713 AvatarAppearance appearance = null;
714 714
@@ -733,7 +733,7 @@ namespace OpenSim.Region.Communications.OGS1
733 return appearance; 733 return appearance;
734 } 734 }
735 735
736 public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 736 public void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
737 { 737 {
738 try 738 try
739 { 739 {