aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs6
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs10
-rw-r--r--OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs10
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs46
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs10
-rw-r--r--OpenSim/Grid/InventoryServer/Main.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/Main.cs8
-rw-r--r--OpenSim/Grid/MessagingServer/MessageService.cs40
-rw-r--r--OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs16
-rw-r--r--OpenSim/Grid/MessagingServer/UserManager.cs6
-rw-r--r--OpenSim/Grid/MessagingServer/UserPresenceData.cs4
-rw-r--r--OpenSim/Grid/MessagingServer/XMPPHTTPService.cs10
-rw-r--r--OpenSim/Grid/ScriptServer/ScriptServerMain.cs4
-rw-r--r--OpenSim/Grid/UserServer/Main.cs20
-rw-r--r--OpenSim/Grid/UserServer/MessageServersConnector.cs12
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs14
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs84
17 files changed, 152 insertions, 152 deletions
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 6d46048..bded875 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using log4net.Config; 33using log4net.Config;
34using OpenSim.Framework; 34using OpenSim.Framework;
@@ -108,7 +108,7 @@ namespace OpenSim.Grid.AssetServer
108 m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider)); 108 m_httpServer.AddStreamHandler(new PostAssetStreamHandler(this, m_assetProvider));
109 } 109 }
110 110
111 public byte[] GetAssetData(LLUUID assetID, bool isTexture) 111 public byte[] GetAssetData(UUID assetID, bool isTexture)
112 { 112 {
113 return null; 113 return null;
114 } 114 }
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.AssetServer
119 new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect)); 119 new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect));
120 120
121 // loader will try to load all providers (MySQL, MSSQL, etc) 121 // loader will try to load all providers (MySQL, MSSQL, etc)
122 // unless it is constrainted to the correct "Provider" entry in the addin.xml 122 // unless it is constrainted to the correct "Provider" entry in the addin.Xml
123 loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); 123 loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider));
124 loader.Load(); 124 loader.Load();
125 125
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index f63b78b..457142f 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -32,7 +32,7 @@ using System.Reflection;
32using System.Text; 32using System.Text;
33using System.Xml; 33using System.Xml;
34using System.Xml.Serialization; 34using System.Xml.Serialization;
35using libsecondlife; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Servers; 38using OpenSim.Framework.Servers;
@@ -70,9 +70,9 @@ namespace OpenSim.Grid.AssetServer
70 70
71 if (p.Length > 0) 71 if (p.Length > 0)
72 { 72 {
73 LLUUID assetID = null; 73 UUID assetID = null;
74 74
75 if (!LLUUID.TryParse(p[0], out assetID)) 75 if (!UUID.TryParse(p[0], out assetID))
76 { 76 {
77 m_log.InfoFormat( 77 m_log.InfoFormat(
78 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]); 78 "[REST]: GET:/asset ignoring request with malformed UUID {0}", p[0]);
@@ -128,9 +128,9 @@ namespace OpenSim.Grid.AssetServer
128 { 128 {
129 string param = GetParam(path); 129 string param = GetParam(path);
130 130
131 LLUUID assetId; 131 UUID assetId;
132 if (param.Length > 0) 132 if (param.Length > 0)
133 LLUUID.TryParse(param, out assetId); 133 UUID.TryParse(param, out assetId);
134 // byte[] txBuffer = new byte[4096]; 134 // byte[] txBuffer = new byte[4096];
135 135
136 XmlSerializer xs = new XmlSerializer(typeof (AssetBase)); 136 XmlSerializer xs = new XmlSerializer(typeof (AssetBase));
diff --git a/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs
index a36d396..5de5bb3 100644
--- a/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs
+++ b/OpenSim/Grid/Communications/OGS1/OGS1InterServiceInventoryService.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Communications; 32using OpenSim.Framework.Communications;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
@@ -51,10 +51,10 @@ namespace OpenSim.Grid.Communications.OGS1
51 /// </summary> 51 /// </summary>
52 /// <param name="userId"></param> 52 /// <param name="userId"></param>
53 /// <returns></returns> 53 /// <returns></returns>
54 public bool CreateNewUserInventory(LLUUID userId) 54 public bool CreateNewUserInventory(UUID userId)
55 { 55 {
56 return SynchronousRestObjectPoster.BeginPostObject<Guid, bool>( 56 return SynchronousRestObjectPoster.BeginPostObject<Guid, bool>(
57 "POST", m_inventoryServerUrl + "CreateInventory/", userId.UUID); 57 "POST", m_inventoryServerUrl + "CreateInventory/", userId.Guid);
58 } 58 }
59 59
60 /// <summary> 60 /// <summary>
@@ -62,10 +62,10 @@ namespace OpenSim.Grid.Communications.OGS1
62 /// </summary> 62 /// </summary>
63 /// <param name="userId"></param> 63 /// <param name="userId"></param>
64 /// <returns></returns> 64 /// <returns></returns>
65 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId) 65 public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
66 { 66 {
67 return SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>( 67 return SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
68 "POST", m_inventoryServerUrl + "RootFolders/", userId.UUID); 68 "POST", m_inventoryServerUrl + "RootFolders/", userId.Guid);
69 } 69 }
70 } 70 }
71} 71}
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index eb4aea6..6fbfc71 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -32,7 +32,7 @@ using System.Collections.Generic;
32using System.IO; 32using System.IO;
33using System.Reflection; 33using System.Reflection;
34using System.Xml; 34using System.Xml;
35using libsecondlife; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38using OpenSim.Data; 38using OpenSim.Data;
@@ -68,7 +68,7 @@ namespace OpenSim.Grid.GridServer
68 new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); 68 new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect));
69 69
70 // loader will try to load all providers (MySQL, MSSQL, etc) 70 // loader will try to load all providers (MySQL, MSSQL, etc)
71 // unless it is constrainted to the correct "Provider" entry in the addin.xml 71 // unless it is constrainted to the correct "Provider" entry in the addin.Xml
72 gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); 72 gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider));
73 logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); 73 logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider));
74 74
@@ -107,13 +107,13 @@ namespace OpenSim.Grid.GridServer
107 /// </summary> 107 /// </summary>
108 /// <param name="uuid">A UUID key of the region to return</param> 108 /// <param name="uuid">A UUID key of the region to return</param>
109 /// <returns>A SimProfileData for the region</returns> 109 /// <returns>A SimProfileData for the region</returns>
110 public RegionProfileData GetRegion(LLUUID uuid) 110 public RegionProfileData GetRegion(UUID uuid)
111 { 111 {
112 foreach (IGridDataPlugin plugin in _plugins) 112 foreach (IGridDataPlugin plugin in _plugins)
113 { 113 {
114 try 114 try
115 { 115 {
116 return plugin.GetProfileByLLUUID(uuid); 116 return plugin.GetProfileByUUID(uuid);
117 } 117 }
118 catch (Exception e) 118 catch (Exception e)
119 { 119 {
@@ -340,9 +340,9 @@ namespace OpenSim.Grid.GridServer
340 RegionProfileData existingSim; 340 RegionProfileData existingSim;
341 341
342 Hashtable requestData = (Hashtable)request.Params[0]; 342 Hashtable requestData = (Hashtable)request.Params[0];
343 LLUUID uuid; 343 UUID uuid;
344 344
345 if (!requestData.ContainsKey("UUID") || !LLUUID.TryParse((string)requestData["UUID"], out uuid)) 345 if (!requestData.ContainsKey("UUID") || !UUID.TryParse((string)requestData["UUID"], out uuid))
346 { 346 {
347 m_log.Warn("[LOGIN PRELUDE]: Region connected without a UUID, sending back error response."); 347 m_log.Warn("[LOGIN PRELUDE]: Region connected without a UUID, sending back error response.");
348 return ErrorResponse("No UUID passed to grid server - unable to connect you"); 348 return ErrorResponse("No UUID passed to grid server - unable to connect you");
@@ -425,7 +425,7 @@ namespace OpenSim.Grid.GridServer
425 catch (Exception e) 425 catch (Exception e)
426 { 426 {
427 m_log.Warn("[LOGIN END]: " + 427 m_log.Warn("[LOGIN END]: " +
428 "Unable to login region " + sim.UUID.ToString() + " via " + plugin.Name); 428 "Unable to login region " + sim.ToString() + " via " + plugin.Name);
429 m_log.Warn("[LOGIN END]: " + e.ToString()); 429 m_log.Warn("[LOGIN END]: " + e.ToString());
430 } 430 }
431 } 431 }
@@ -471,7 +471,7 @@ namespace OpenSim.Grid.GridServer
471 responseData["user_recvkey"] = sim.regionUserRecvKey; 471 responseData["user_recvkey"] = sim.regionUserRecvKey;
472 responseData["authkey"] = sim.regionSecret; 472 responseData["authkey"] = sim.regionSecret;
473 473
474 // New! If set, use as URL to local sim storage (ie http://remotehost/region.yap) 474 // New! If set, use as URL to local sim storage (ie http://remotehost/region.Yap)
475 responseData["data_uri"] = sim.regionDataURI; 475 responseData["data_uri"] = sim.regionDataURI;
476 476
477 responseData["allow_forceful_banlines"] = Config.AllowForcefulBanlines; 477 responseData["allow_forceful_banlines"] = Config.AllowForcefulBanlines;
@@ -515,7 +515,7 @@ namespace OpenSim.Grid.GridServer
515 NeighbourBlock["sim_port"] = aSim.Value.serverPort.ToString(); 515 NeighbourBlock["sim_port"] = aSim.Value.serverPort.ToString();
516 NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString(); 516 NeighbourBlock["region_locx"] = aSim.Value.regionLocX.ToString();
517 NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString(); 517 NeighbourBlock["region_locy"] = aSim.Value.regionLocY.ToString();
518 NeighbourBlock["UUID"] = aSim.Value.UUID.ToString(); 518 NeighbourBlock["UUID"] = aSim.Value.ToString();
519 NeighbourBlock["regionHandle"] = aSim.Value.regionHandle.ToString(); 519 NeighbourBlock["regionHandle"] = aSim.Value.regionHandle.ToString();
520 520
521 if (aSim.Value.UUID != sim.UUID) 521 if (aSim.Value.UUID != sim.UUID)
@@ -566,8 +566,8 @@ namespace OpenSim.Grid.GridServer
566 RegionProfileData sim; 566 RegionProfileData sim;
567 sim = new RegionProfileData(); 567 sim = new RegionProfileData();
568 568
569 sim.UUID = new LLUUID((string)requestData["UUID"]); 569 sim.UUID = new UUID((string)requestData["UUID"]);
570 sim.originUUID = new LLUUID((string)requestData["originUUID"]); 570 sim.originUUID = new UUID((string)requestData["originUUID"]);
571 571
572 sim.regionRecvKey = String.Empty; 572 sim.regionRecvKey = String.Empty;
573 sim.regionSendKey = String.Empty; 573 sim.regionSendKey = String.Empty;
@@ -602,8 +602,8 @@ namespace OpenSim.Grid.GridServer
602 sim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]); 602 sim.regionLocY = Convert.ToUInt32((string)requestData["region_locy"]);
603 sim.regionLocZ = 0; 603 sim.regionLocZ = 0;
604 604
605 LLUUID textureID; 605 UUID textureID;
606 if (LLUUID.TryParse((string)requestData["map-image-id"], out textureID)) 606 if (UUID.TryParse((string)requestData["map-image-id"], out textureID))
607 { 607 {
608 sim.regionMapTextureID = textureID; 608 sim.regionMapTextureID = textureID;
609 } 609 }
@@ -654,11 +654,11 @@ namespace OpenSim.Grid.GridServer
654 654
655 if (requestData.ContainsKey("UUID")) 655 if (requestData.ContainsKey("UUID"))
656 { 656 {
657 //TheSim = GetRegion(new LLUUID((string) requestData["UUID"])); 657 //TheSim = GetRegion(new UUID((string) requestData["UUID"]));
658 uuid = requestData["UUID"].ToString(); 658 uuid = requestData["UUID"].ToString();
659 m_log.InfoFormat("[LOGOUT]: Logging out region: {0}", uuid); 659 m_log.InfoFormat("[LOGOUT]: Logging out region: {0}", uuid);
660 660
661 // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcDeleteRegionMethod","", 5,"Attempting delete with UUID."); 661 // logToDB((new UUID((string)requestData["UUID"])).ToString(),"XmlRpcDeleteRegionMethod","", 5,"Attempting delete with UUID.");
662 } 662 }
663 else 663 else
664 { 664 {
@@ -716,7 +716,7 @@ namespace OpenSim.Grid.GridServer
716 RegionProfileData simData = null; 716 RegionProfileData simData = null;
717 if (requestData.ContainsKey("region_UUID")) 717 if (requestData.ContainsKey("region_UUID"))
718 { 718 {
719 LLUUID regionID = new LLUUID((string)requestData["region_UUID"]); 719 UUID regionID = new UUID((string)requestData["region_UUID"]);
720 simData = GetRegion(regionID); 720 simData = GetRegion(regionID);
721 if (simData == null) 721 if (simData == null)
722 { 722 {
@@ -764,7 +764,7 @@ namespace OpenSim.Grid.GridServer
764 responseData["remoting_port"] = simData.remotingPort.ToString(); 764 responseData["remoting_port"] = simData.remotingPort.ToString();
765 responseData["region_locx"] = simData.regionLocX.ToString(); 765 responseData["region_locx"] = simData.regionLocX.ToString();
766 responseData["region_locy"] = simData.regionLocY.ToString(); 766 responseData["region_locy"] = simData.regionLocY.ToString();
767 responseData["region_UUID"] = simData.UUID.UUID.ToString(); 767 responseData["region_UUID"] = simData.UUID.Guid.ToString();
768 responseData["region_name"] = simData.regionName; 768 responseData["region_name"] = simData.regionName;
769 responseData["regionHandle"] = simData.regionHandle.ToString(); 769 responseData["regionHandle"] = simData.regionHandle.ToString();
770 } 770 }
@@ -923,8 +923,8 @@ namespace OpenSim.Grid.GridServer
923 923
924 RegionProfileData TheSim; 924 RegionProfileData TheSim;
925 925
926 LLUUID UUID; 926 UUID UUID;
927 if (LLUUID.TryParse(param, out UUID)) 927 if (UUID.TryParse(param, out UUID))
928 { 928 {
929 TheSim = GetRegion(UUID); 929 TheSim = GetRegion(UUID);
930 930
@@ -933,7 +933,7 @@ namespace OpenSim.Grid.GridServer
933 respstring = "<Root>"; 933 respstring = "<Root>";
934 respstring += "<authkey>" + TheSim.regionSendKey + "</authkey>"; 934 respstring += "<authkey>" + TheSim.regionSendKey + "</authkey>";
935 respstring += "<sim>"; 935 respstring += "<sim>";
936 respstring += "<uuid>" + TheSim.UUID.ToString() + "</uuid>"; 936 respstring += "<uuid>" + TheSim.ToString() + "</uuid>";
937 respstring += "<regionname>" + TheSim.regionName + "</regionname>"; 937 respstring += "<regionname>" + TheSim.regionName + "</regionname>";
938 respstring += "<sim_ip>" + Util.GetHostFromDNS(TheSim.serverIP).ToString() + "</sim_ip>"; 938 respstring += "<sim_ip>" + Util.GetHostFromDNS(TheSim.serverIP).ToString() + "</sim_ip>";
939 respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>"; 939 respstring += "<sim_port>" + TheSim.serverPort.ToString() + "</sim_port>";
@@ -969,11 +969,11 @@ namespace OpenSim.Grid.GridServer
969 { 969 {
970 Console.WriteLine("Processing region update via REST method"); 970 Console.WriteLine("Processing region update via REST method");
971 RegionProfileData theSim; 971 RegionProfileData theSim;
972 theSim = GetRegion(new LLUUID(param)); 972 theSim = GetRegion(new UUID(param));
973 if (theSim == null) 973 if (theSim == null)
974 { 974 {
975 theSim = new RegionProfileData(); 975 theSim = new RegionProfileData();
976 LLUUID UUID = new LLUUID(param); 976 UUID UUID = new UUID(param);
977 theSim.UUID = UUID; 977 theSim.UUID = UUID;
978 theSim.regionRecvKey = Config.SimRecvKey; 978 theSim.regionRecvKey = Config.SimRecvKey;
979 } 979 }
@@ -1067,7 +1067,7 @@ namespace OpenSim.Grid.GridServer
1067 { 1067 {
1068 plugin.AddProfile(theSim); 1068 plugin.AddProfile(theSim);
1069 m_log.Info("[grid]: New sim added to grid (" + theSim.regionName + ")"); 1069 m_log.Info("[grid]: New sim added to grid (" + theSim.regionName + ")");
1070 logToDB(theSim.UUID.ToString(), "RestSetSimMethod", String.Empty, 5, 1070 logToDB(theSim.ToString(), "RestSetSimMethod", String.Empty, 5,
1071 "Region successfully updated and connected to grid."); 1071 "Region successfully updated and connected to grid.");
1072 } 1072 }
1073 else 1073 else
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index e4d43d4..4d58775 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -32,7 +32,7 @@ using System.Reflection;
32using System.Threading; 32using System.Threading;
33using System.Net; 33using System.Net;
34 34
35using libsecondlife; 35using OpenMetaverse;
36using log4net; 36using log4net;
37using Nwc.XmlRpc; 37using Nwc.XmlRpc;
38 38
@@ -147,7 +147,7 @@ namespace OpenSim.Grid.InventoryServer
147 } 147 }
148 } 148 }
149 149
150 public override void RequestInventoryForUser(LLUUID userID, InventoryReceiptCallback callback) 150 public override void RequestInventoryForUser(UUID userID, InventoryReceiptCallback callback)
151 { 151 {
152 } 152 }
153 153
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.InventoryServer
158 /// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns> 158 /// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns>
159 public InventoryCollection GetUserInventory(Guid rawUserID) 159 public InventoryCollection GetUserInventory(Guid rawUserID)
160 { 160 {
161 LLUUID userID = new LLUUID(rawUserID); 161 UUID userID = new UUID(rawUserID);
162 162
163 m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID); 163 m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID);
164 164
@@ -216,7 +216,7 @@ namespace OpenSim.Grid.InventoryServer
216 /// <returns></returns> 216 /// <returns></returns>
217 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID) 217 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
218 { 218 {
219 LLUUID userID = new LLUUID(rawUserID); 219 UUID userID = new UUID(rawUserID);
220 return GetInventorySkeleton(userID); 220 return GetInventorySkeleton(userID);
221 } 221 }
222 222
@@ -227,7 +227,7 @@ namespace OpenSim.Grid.InventoryServer
227 /// <returns></returns> 227 /// <returns></returns>
228 public bool CreateUsersInventory(Guid rawUserID) 228 public bool CreateUsersInventory(Guid rawUserID)
229 { 229 {
230 LLUUID userID = new LLUUID(rawUserID); 230 UUID userID = new UUID(rawUserID);
231 231
232 m_log.InfoFormat("[GRID AGENT INVENTORY]: Creating new set of inventory folders for user {0}", userID); 232 m_log.InfoFormat("[GRID AGENT INVENTORY]: Creating new set of inventory folders for user {0}", userID);
233 233
diff --git a/OpenSim/Grid/InventoryServer/Main.cs b/OpenSim/Grid/InventoryServer/Main.cs
index a77c570..9f40d16 100644
--- a/OpenSim/Grid/InventoryServer/Main.cs
+++ b/OpenSim/Grid/InventoryServer/Main.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using log4net.Config; 34using log4net.Config;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -142,7 +142,7 @@ namespace OpenSim.Grid.InventoryServer
142 switch (cmd) 142 switch (cmd)
143 { 143 {
144 case "add-user": 144 case "add-user":
145 m_inventoryService.CreateUsersInventory(LLUUID.Random().UUID); 145 m_inventoryService.CreateUsersInventory(UUID.Random().Guid);
146 break; 146 break;
147 } 147 }
148 } 148 }
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index c80d48c..f9be780 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -28,7 +28,7 @@
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Reflection; 30using System.Reflection;
31using libsecondlife; 31using OpenMetaverse;
32using log4net; 32using log4net;
33using log4net.Config; 33using log4net.Config;
34 34
@@ -48,7 +48,7 @@ namespace OpenSim.Grid.MessagingServer
48 private MessageServerConfig Cfg; 48 private MessageServerConfig Cfg;
49 private MessageService msgsvc; 49 private MessageService msgsvc;
50 50
51 // private LLUUID m_lastCreatedUser = LLUUID.Random(); 51 // private UUID m_lastCreatedUser = UUID.Random();
52 52
53 public static void Main(string[] args) 53 public static void Main(string[] args)
54 { 54 {
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.MessagingServer
84 { 84 {
85 base.Startup(); 85 base.Startup();
86 86
87 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); 87 Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.Xml")));
88 88
89 m_log.Info("[REGION]: Starting HTTP process"); 89 m_log.Info("[REGION]: Starting HTTP process");
90 m_httpServer = new BaseHttpServer(Cfg.HttpPort); 90 m_httpServer = new BaseHttpServer(Cfg.HttpPort);
@@ -133,7 +133,7 @@ namespace OpenSim.Grid.MessagingServer
133 try 133 try
134 { 134 {
135 //RestObjectPoster.BeginPostObject<Guid>(m_userManager._config.InventoryUrl + "CreateInventory/", 135 //RestObjectPoster.BeginPostObject<Guid>(m_userManager._config.InventoryUrl + "CreateInventory/",
136 //userID.UUID); 136 //userID.Guid);
137 } 137 }
138 catch (Exception ex) 138 catch (Exception ex)
139 { 139 {
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 {
diff --git a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
index 281beb9..4d6f3de 100644
--- a/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
+++ b/OpenSim/Grid/MessagingServer/PresenceBackreferenceEntry.cs
@@ -28,21 +28,21 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using libsecondlife; 31using OpenMetaverse;
32 32
33namespace OpenSim.Grid.MessagingServer 33namespace OpenSim.Grid.MessagingServer
34{ 34{
35 // This is a wrapper for a List<LLUUID> so it can be happily stored in a hashtable. 35 // This is a wrapper for a List<UUID> so it can be happily stored in a hashtable.
36 public class PresenceBackreferenceEntry 36 public class PresenceBackreferenceEntry
37 { 37 {
38 List<LLUUID> AgentList = new List<LLUUID>(); 38 List<UUID> AgentList = new List<UUID>();
39 39
40 public PresenceBackreferenceEntry() 40 public PresenceBackreferenceEntry()
41 { 41 {
42 42
43 } 43 }
44 44
45 public void Add(LLUUID item) 45 public void Add(UUID item)
46 { 46 {
47 lock (AgentList) 47 lock (AgentList)
48 { 48 {
@@ -50,9 +50,9 @@ namespace OpenSim.Grid.MessagingServer
50 } 50 }
51 } 51 }
52 52
53 public LLUUID getitem(int index) 53 public UUID getitem(int index)
54 { 54 {
55 LLUUID result = null; 55 UUID result = null;
56 lock (AgentList) 56 lock (AgentList)
57 { 57 {
58 if (index > 0 && index < AgentList.Count) 58 if (index > 0 && index < AgentList.Count)
@@ -76,7 +76,7 @@ namespace OpenSim.Grid.MessagingServer
76 } 76 }
77 } 77 }
78 78
79 public void Remove(LLUUID item) 79 public void Remove(UUID item)
80 { 80 {
81 lock (AgentList) 81 lock (AgentList)
82 { 82 {
@@ -85,7 +85,7 @@ namespace OpenSim.Grid.MessagingServer
85 } 85 }
86 } 86 }
87 87
88 public bool contains(LLUUID item) 88 public bool contains(UUID item)
89 { 89 {
90 bool result = false; 90 bool result = false;
91 lock (AgentList) 91 lock (AgentList)
diff --git a/OpenSim/Grid/MessagingServer/UserManager.cs b/OpenSim/Grid/MessagingServer/UserManager.cs
index de41756..6fa5113 100644
--- a/OpenSim/Grid/MessagingServer/UserManager.cs
+++ b/OpenSim/Grid/MessagingServer/UserManager.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework; 36using OpenSim.Framework;
@@ -41,7 +41,7 @@ namespace OpenSim.Grid.MessagingServer
41{ 41{
42 class UserManager : UserManagerBase 42 class UserManager : UserManagerBase
43 { 43 {
44 public UserAgentData GetUserAgentData(LLUUID AgentID) 44 public UserAgentData GetUserAgentData(UUID AgentID)
45 { 45 {
46 UserProfileData userProfile = GetUserProfile(AgentID); 46 UserProfileData userProfile = GetUserProfile(AgentID);
47 47
@@ -67,7 +67,7 @@ namespace OpenSim.Grid.MessagingServer
67 return null; 67 return null;
68 } 68 }
69 69
70 public override UserProfileData SetupMasterUser(LLUUID uuid) 70 public override UserProfileData SetupMasterUser(UUID uuid)
71 { 71 {
72 //throw new Exception("The method or operation is not implemented."); 72 //throw new Exception("The method or operation is not implemented.");
73 return null; 73 return null;
diff --git a/OpenSim/Grid/MessagingServer/UserPresenceData.cs b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
index 3c5002c..2119c13 100644
--- a/OpenSim/Grid/MessagingServer/UserPresenceData.cs
+++ b/OpenSim/Grid/MessagingServer/UserPresenceData.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using OpenMetaverse;
31using OpenSim.Data; 31using OpenSim.Data;
32using OpenSim.Framework; 32using OpenSim.Framework;
33 33
@@ -39,7 +39,7 @@ namespace OpenSim.Grid.MessagingServer
39 public RegionProfileData regionData = new RegionProfileData(); 39 public RegionProfileData regionData = new RegionProfileData();
40 public string httpURI = String.Empty; 40 public string httpURI = String.Empty;
41 public List<FriendListItem> friendData = new List<FriendListItem> (); 41 public List<FriendListItem> friendData = new List<FriendListItem> ();
42 public List<LLUUID> subscriptionData = new List<LLUUID>(); 42 public List<UUID> subscriptionData = new List<UUID>();
43 public bool OnlineYN = true; 43 public bool OnlineYN = true;
44 public bool lookupUserRegionYN = true; 44 public bool lookupUserRegionYN = true;
45 45
diff --git a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
index 13bf290..3b433ba 100644
--- a/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
+++ b/OpenSim/Grid/MessagingServer/XMPPHTTPService.cs
@@ -29,7 +29,7 @@ using System;
29using System.IO; 29using System.IO;
30using System.Net; 30using System.Net;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using OpenSim.Framework.Servers; 34using OpenSim.Framework.Servers;
35 35
@@ -63,9 +63,9 @@ namespace OpenSim.Grid.MessagingServer
63 63
64 if (p.Length > 0) 64 if (p.Length > 0)
65 { 65 {
66 LLUUID assetID = null; 66 UUID assetID = null;
67 67
68 if (!LLUUID.TryParse(p[0], out assetID)) 68 if (!UUID.TryParse(p[0], out assetID))
69 { 69 {
70 m_log.InfoFormat( 70 m_log.InfoFormat(
71 "[REST]: GET:/presence ignoring request with malformed UUID {0}", p[0]); 71 "[REST]: GET:/presence ignoring request with malformed UUID {0}", p[0]);
@@ -91,9 +91,9 @@ namespace OpenSim.Grid.MessagingServer
91 { 91 {
92 string param = GetParam(path); 92 string param = GetParam(path);
93 93
94 LLUUID assetId; 94 UUID assetId;
95 if (param.Length > 0) 95 if (param.Length > 0)
96 LLUUID.TryParse(param, out assetId); 96 UUID.TryParse(param, out assetId);
97 // byte[] txBuffer = new byte[4096]; 97 // byte[] txBuffer = new byte[4096];
98 98
99 // TODO: Read POST serialize XMPP stanzas 99 // TODO: Read POST serialize XMPP stanzas
diff --git a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
index 63bdea8..4b226ae 100644
--- a/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
+++ b/OpenSim/Grid/ScriptServer/ScriptServerMain.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Reflection; 29using System.Reflection;
30using libsecondlife; 30using OpenMetaverse;
31using log4net; 31using log4net;
32using OpenSim.Framework.Console; 32using OpenSim.Framework.Console;
33using OpenSim.Framework.Servers; 33using OpenSim.Framework.Servers;
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.ScriptServer
92 92
93 if (Command == "OnRezScript") 93 if (Command == "OnRezScript")
94 { 94 {
95 Engine.EventManager().OnRezScript((uint)p[0], new LLUUID((string)p[1]), (string)p[2], 0, false); 95 Engine.EventManager().OnRezScript((uint)p[0], new UUID((string)p[1]), (string)p[2], 0, false);
96 } 96 }
97 } 97 }
98 98
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index e487648..6441b7a 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using log4net.Config; 35using log4net.Config;
36using OpenSim.Framework; 36using OpenSim.Framework;
@@ -58,7 +58,7 @@ namespace OpenSim.Grid.UserServer
58 public MessageServersConnector m_messagesService; 58 public MessageServersConnector m_messagesService;
59 protected IInterServiceInventoryServices m_interServiceInventoryService; 59 protected IInterServiceInventoryServices m_interServiceInventoryService;
60 60
61 private LLUUID m_lastCreatedUser = LLUUID.Random(); 61 private UUID m_lastCreatedUser = UUID.Random();
62 62
63 public static void Main(string[] args) 63 public static void Main(string[] args)
64 { 64 {
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer
92 { 92 {
93 base.Startup(); 93 base.Startup();
94 94
95 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); 95 Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.Xml")));
96 96
97 m_stats = StatsManager.StartCollectingUserStats(); 97 m_stats = StatsManager.StartCollectingUserStats();
98 98
@@ -183,7 +183,7 @@ namespace OpenSim.Grid.UserServer
183 183
184 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty); 184 tempMD5Passwd = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + String.Empty);
185 185
186 LLUUID userID = new LLUUID(); 186 UUID userID = new UUID();
187 187
188 try 188 try
189 { 189 {
@@ -209,7 +209,7 @@ namespace OpenSim.Grid.UserServer
209 { 209 {
210 m_log.ErrorFormat( 210 m_log.ErrorFormat(
211 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", 211 "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
212 Cfg.InventoryUrl + "CreateInventory/", userID.UUID); 212 Cfg.InventoryUrl + "CreateInventory/", userID);
213 } 213 }
214 catch (Exception e) 214 catch (Exception e)
215 { 215 {
@@ -240,8 +240,8 @@ namespace OpenSim.Grid.UserServer
240 case "test-inventory": 240 case "test-inventory":
241 // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); 241 // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
242 // requester.ReturnResponseVal = TestResponse; 242 // requester.ReturnResponseVal = TestResponse;
243 // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); 243 // requester.BeginPostObject<UUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
244 SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>( 244 SynchronousRestObjectPoster.BeginPostObject<UUID, List<InventoryFolderBase>>(
245 "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser); 245 "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser);
246 break; 246 break;
247 247
@@ -322,12 +322,12 @@ namespace OpenSim.Grid.UserServer
322 m_console.Notice("response got"); 322 m_console.Notice("response got");
323 } 323 }
324 324
325 public void NotifyMessageServersUserLoggOff(LLUUID agentID) 325 public void NotifyMessageServersUserLoggOff(UUID agentID)
326 { 326 {
327 m_messagesService.TellMessageServersAboutUserLogoff(agentID); 327 m_messagesService.TellMessageServersAboutUserLogoff(agentID);
328 } 328 }
329 329
330 public void NotifyMessageServersUserLoggedInToLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 330 public void NotifyMessageServersUserLoggedInToLocation(UUID agentID, UUID sessionID, UUID RegionID,
331 ulong regionhandle, float positionX, float positionY, 331 ulong regionhandle, float positionX, float positionY,
332 float positionZ, string firstname, string lastname) 332 float positionZ, string firstname, string lastname)
333 { 333 {
@@ -335,4 +335,4 @@ namespace OpenSim.Grid.UserServer
335 positionY, positionZ, firstname, lastname); 335 positionY, positionZ, firstname, lastname);
336 } 336 }
337 } 337 }
338} \ No newline at end of file 338}
diff --git a/OpenSim/Grid/UserServer/MessageServersConnector.cs b/OpenSim/Grid/UserServer/MessageServersConnector.cs
index b3f8b19..8fecd5b 100644
--- a/OpenSim/Grid/UserServer/MessageServersConnector.cs
+++ b/OpenSim/Grid/UserServer/MessageServersConnector.cs
@@ -29,7 +29,7 @@ using System.Collections;
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 Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Framework.Servers; 35using OpenSim.Framework.Servers;
@@ -146,7 +146,7 @@ namespace OpenSim.Grid.UserServer
146 // string scurrentRegionID = (string)requestData["regionid"]; 146 // string scurrentRegionID = (string)requestData["regionid"];
147 // string sregionhandle = (string)requestData["regionhandle"]; 147 // string sregionhandle = (string)requestData["regionhandle"];
148 // string scurrentpos = (string)requestData["currentpos"]; 148 // string scurrentpos = (string)requestData["currentpos"];
149 //LLVector3.TryParse((string)reader["currentPos"], out retval.currentPos); 149 //Vector3.TryParse((string)reader["currentPos"], out retval.currentPos);
150 // TODO: Okay now raise event so the user server can pass this data to the Usermanager 150 // TODO: Okay now raise event so the user server can pass this data to the Usermanager
151 151
152 responseData["responsestring"] = "TRUE"; 152 responseData["responsestring"] = "TRUE";
@@ -155,7 +155,7 @@ namespace OpenSim.Grid.UserServer
155 return response; 155 return response;
156 } 156 }
157 157
158 public void TellMessageServersAboutUser(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 158 public void TellMessageServersAboutUser(UUID agentID, UUID sessionID, UUID RegionID,
159 ulong regionhandle, float positionX, float positionY, 159 ulong regionhandle, float positionX, float positionY,
160 float positionZ, string firstname, string lastname) 160 float positionZ, string firstname, string lastname)
161 { 161 {
@@ -179,7 +179,7 @@ namespace OpenSim.Grid.UserServer
179 } 179 }
180 } 180 }
181 181
182 public void TellMessageServersAboutUserLogoff(LLUUID agentID) 182 public void TellMessageServersAboutUserLogoff(UUID agentID)
183 { 183 {
184 lock (MessageServers) 184 lock (MessageServers)
185 { 185 {
@@ -198,7 +198,7 @@ namespace OpenSim.Grid.UserServer
198 } 198 }
199 } 199 }
200 200
201 private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, LLUUID agentID) 201 private void NotifyMessageServerAboutUserLogoff(MessageServerInfo serv, UUID agentID)
202 { 202 {
203 Hashtable reqparams = new Hashtable(); 203 Hashtable reqparams = new Hashtable();
204 reqparams["sendkey"] = serv.sendkey; 204 reqparams["sendkey"] = serv.sendkey;
@@ -219,7 +219,7 @@ namespace OpenSim.Grid.UserServer
219 } 219 }
220 220
221 private void NotifyMessageServerAboutUser(MessageServerInfo serv, 221 private void NotifyMessageServerAboutUser(MessageServerInfo serv,
222 LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 222 UUID agentID, UUID sessionID, UUID RegionID,
223 ulong regionhandle, float positionX, float positionY, float positionZ, 223 ulong regionhandle, float positionX, float positionY, float positionZ,
224 string firstname, string lastname) 224 string firstname, string lastname)
225 { 225 {
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 1f84346..10490a6 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Data; 35using OpenSim.Data;
@@ -39,7 +39,7 @@ using OpenSim.Framework.Communications.Cache;
39 39
40namespace OpenSim.Grid.UserServer 40namespace OpenSim.Grid.UserServer
41{ 41{
42 public delegate void UserLoggedInAtLocation(LLUUID agentID, LLUUID sessionID, LLUUID RegionID, 42 public delegate void UserLoggedInAtLocation(UUID agentID, UUID sessionID, UUID RegionID,
43 ulong regionhandle, float positionX, float positionY, float positionZ, 43 ulong regionhandle, float positionX, float positionY, float positionZ,
44 string firstname, string lastname); 44 string firstname, string lastname);
45 45
@@ -151,7 +151,7 @@ namespace OpenSim.Grid.UserServer
151 int start_z = -1; 151 int start_z = -1;
152 152
153 // use the homeRegionID if it is stored already. If not, use the regionHandle as before 153 // use the homeRegionID if it is stored already. If not, use the regionHandle as before
154 if (theUser.HomeRegionID != LLUUID.Zero) 154 if (theUser.HomeRegionID != UUID.Zero)
155 { 155 {
156 HomeInfo = 156 HomeInfo =
157 RegionProfileData.RequestSimProfileData( 157 RegionProfileData.RequestSimProfileData(
@@ -271,7 +271,7 @@ namespace OpenSim.Grid.UserServer
271 theUser.CurrentAgent.Handle = SimInfo.regionHandle; 271 theUser.CurrentAgent.Handle = SimInfo.regionHandle;
272 if (start_x >= 0 && start_y >= 0 && start_z >= 0) 272 if (start_x >= 0 && start_y >= 0 && start_z >= 0)
273 { 273 {
274 LLVector3 tmp_v = new LLVector3(start_x, start_y, start_z); 274 Vector3 tmp_v = new Vector3(start_x, start_y, start_z);
275 theUser.CurrentAgent.Position = tmp_v; 275 theUser.CurrentAgent.Position = tmp_v;
276 } 276 }
277 // Prepare notification 277 // Prepare notification
@@ -466,7 +466,7 @@ namespace OpenSim.Grid.UserServer
466 } 466 }
467 467
468 // See LoginService 468 // See LoginService
469 protected override InventoryData GetInventorySkeleton(LLUUID userID) 469 protected override InventoryData GetInventorySkeleton(UUID userID)
470 { 470 {
471 m_log.DebugFormat( 471 m_log.DebugFormat(
472 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}", 472 "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of user {1}",
@@ -498,7 +498,7 @@ namespace OpenSim.Grid.UserServer
498 498
499 if (folders != null && folders.Count > 0) 499 if (folders != null && folders.Count > 0)
500 { 500 {
501 LLUUID rootID = LLUUID.Zero; 501 UUID rootID = UUID.Zero;
502 ArrayList AgentInventoryArray = new ArrayList(); 502 ArrayList AgentInventoryArray = new ArrayList();
503 Hashtable TempHash; 503 Hashtable TempHash;
504 504
@@ -506,7 +506,7 @@ namespace OpenSim.Grid.UserServer
506 { 506 {
507// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name); 507// m_log.DebugFormat("[LOGIN]: Received agent inventory folder {0}", InvFolder.name);
508 508
509 if (InvFolder.ParentID == LLUUID.Zero) 509 if (InvFolder.ParentID == UUID.Zero)
510 { 510 {
511 rootID = InvFolder.ID; 511 rootID = InvFolder.ID;
512 } 512 }
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index 69c550a..4b5f5a0 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -29,7 +29,7 @@ using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Reflection; 31using System.Reflection;
32using libsecondlife; 32using OpenMetaverse;
33using log4net; 33using log4net;
34using Nwc.XmlRpc; 34using Nwc.XmlRpc;
35using OpenSim.Framework; 35using OpenSim.Framework;
@@ -38,7 +38,7 @@ using OpenSim.Framework.Servers;
38 38
39namespace OpenSim.Grid.UserServer 39namespace OpenSim.Grid.UserServer
40{ 40{
41 public delegate void logOffUser(LLUUID AgentID); 41 public delegate void logOffUser(UUID AgentID);
42 42
43 public class UserManager : UserManagerBase 43 public class UserManager : UserManagerBase
44 { 44 {
@@ -79,7 +79,7 @@ namespace OpenSim.Grid.UserServer
79 return response; 79 return response;
80 } 80 }
81 81
82 public XmlRpcResponse AvatarPickerListtoXmlRPCResponse(LLUUID queryID, List<AvatarPickerAvatar> returnUsers) 82 public XmlRpcResponse AvatarPickerListtoXmlRPCResponse(UUID queryID, List<AvatarPickerAvatar> returnUsers)
83 { 83 {
84 XmlRpcResponse response = new XmlRpcResponse(); 84 XmlRpcResponse response = new XmlRpcResponse();
85 Hashtable responseData = new Hashtable(); 85 Hashtable responseData = new Hashtable();
@@ -108,8 +108,8 @@ namespace OpenSim.Grid.UserServer
108 108
109 for (int i = 0; i < returnUsers.Count; i++) 109 for (int i = 0; i < returnUsers.Count; i++)
110 { 110 {
111 responseData["ownerID" + i] = returnUsers[i].FriendListOwner.UUID.ToString(); 111 responseData["ownerID" + i] = returnUsers[i].FriendListOwner.ToString();
112 responseData["friendID" + i] = returnUsers[i].Friend.UUID.ToString(); 112 responseData["friendID" + i] = returnUsers[i].Friend.ToString();
113 responseData["ownerPerms" + i] = returnUsers[i].FriendListOwnerPerms.ToString(); 113 responseData["ownerPerms" + i] = returnUsers[i].FriendListOwnerPerms.ToString();
114 responseData["friendPerms" + i] = returnUsers[i].FriendPerms.ToString(); 114 responseData["friendPerms" + i] = returnUsers[i].FriendPerms.ToString();
115 } 115 }
@@ -172,11 +172,11 @@ namespace OpenSim.Grid.UserServer
172 // XmlRpcResponse response = new XmlRpcResponse(); 172 // XmlRpcResponse response = new XmlRpcResponse();
173 Hashtable requestData = (Hashtable) request.Params[0]; 173 Hashtable requestData = (Hashtable) request.Params[0];
174 List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>(); 174 List<AvatarPickerAvatar> returnAvatar = new List<AvatarPickerAvatar>();
175 LLUUID queryID = new LLUUID(LLUUID.Zero.ToString()); 175 UUID queryID = new UUID(UUID.Zero.ToString());
176 176
177 if (requestData.Contains("avquery") && requestData.Contains("queryid")) 177 if (requestData.Contains("avquery") && requestData.Contains("queryid"))
178 { 178 {
179 queryID = new LLUUID((string) requestData["queryid"]); 179 queryID = new UUID((string) requestData["queryid"]);
180 returnAvatar = GenerateAgentPickerRequestResponse(queryID, (string) requestData["avquery"]); 180 returnAvatar = GenerateAgentPickerRequestResponse(queryID, (string) requestData["avquery"]);
181 } 181 }
182 182
@@ -195,13 +195,13 @@ namespace OpenSim.Grid.UserServer
195 requestData.Contains("region_uuid")) 195 requestData.Contains("region_uuid"))
196 { 196 {
197 // ulong cregionhandle = 0; 197 // ulong cregionhandle = 0;
198 LLUUID regionUUID; 198 UUID regionUUID;
199 LLUUID avatarUUID; 199 UUID avatarUUID;
200 200
201 Helpers.TryParse((string) requestData["avatar_id"], out avatarUUID); 201 UUID.TryParse((string) requestData["avatar_id"], out avatarUUID);
202 Helpers.TryParse((string) requestData["region_uuid"], out regionUUID); 202 UUID.TryParse((string) requestData["region_uuid"], out regionUUID);
203 203
204 if (avatarUUID != LLUUID.Zero) 204 if (avatarUUID != UUID.Zero)
205 { 205 {
206 UserProfileData userProfile = GetUserProfile(avatarUUID); 206 UserProfileData userProfile = GetUserProfile(avatarUUID);
207 userProfile.CurrentAgent.Region = regionUUID; 207 userProfile.CurrentAgent.Region = regionUUID;
@@ -231,8 +231,8 @@ namespace OpenSim.Grid.UserServer
231 requestData.Contains("friendPerms")) 231 requestData.Contains("friendPerms"))
232 { 232 {
233 // UserManagerBase.AddNewuserFriend 233 // UserManagerBase.AddNewuserFriend
234 AddNewUserFriend(new LLUUID((string) requestData["ownerID"]), 234 AddNewUserFriend(new UUID((string) requestData["ownerID"]),
235 new LLUUID((string) requestData["friendID"]), 235 new UUID((string) requestData["friendID"]),
236 (uint) Convert.ToInt32((string) requestData["friendPerms"])); 236 (uint) Convert.ToInt32((string) requestData["friendPerms"]));
237 returnString = "TRUE"; 237 returnString = "TRUE";
238 } 238 }
@@ -252,8 +252,8 @@ namespace OpenSim.Grid.UserServer
252 if (requestData.Contains("ownerID") && requestData.Contains("friendID")) 252 if (requestData.Contains("ownerID") && requestData.Contains("friendID"))
253 { 253 {
254 // UserManagerBase.AddNewuserFriend 254 // UserManagerBase.AddNewuserFriend
255 RemoveUserFriend(new LLUUID((string) requestData["ownerID"]), 255 RemoveUserFriend(new UUID((string) requestData["ownerID"]),
256 new LLUUID((string) requestData["friendID"])); 256 new UUID((string) requestData["friendID"]));
257 returnString = "TRUE"; 257 returnString = "TRUE";
258 } 258 }
259 responseData["returnString"] = returnString; 259 responseData["returnString"] = returnString;
@@ -271,8 +271,8 @@ namespace OpenSim.Grid.UserServer
271 if (requestData.Contains("ownerID") && requestData.Contains("friendID") && 271 if (requestData.Contains("ownerID") && requestData.Contains("friendID") &&
272 requestData.Contains("friendPerms")) 272 requestData.Contains("friendPerms"))
273 { 273 {
274 UpdateUserFriendPerms(new LLUUID((string) requestData["ownerID"]), 274 UpdateUserFriendPerms(new UUID((string) requestData["ownerID"]),
275 new LLUUID((string) requestData["friendID"]), 275 new UUID((string) requestData["friendID"]),
276 (uint) Convert.ToInt32((string) requestData["friendPerms"])); 276 (uint) Convert.ToInt32((string) requestData["friendPerms"]));
277 // UserManagerBase. 277 // UserManagerBase.
278 returnString = "TRUE"; 278 returnString = "TRUE";
@@ -292,7 +292,7 @@ namespace OpenSim.Grid.UserServer
292 292
293 if (requestData.Contains("ownerID")) 293 if (requestData.Contains("ownerID"))
294 { 294 {
295 returndata = GetUserFriendList(new LLUUID((string) requestData["ownerID"])); 295 returndata = GetUserFriendList(new UUID((string) requestData["ownerID"]));
296 } 296 }
297 297
298 return FriendListItemListtoXmlRPCResponse(returndata); 298 return FriendListItemListtoXmlRPCResponse(returndata);
@@ -306,7 +306,7 @@ namespace OpenSim.Grid.UserServer
306 Hashtable responseData; 306 Hashtable responseData;
307 if (requestData.Contains("owner")) 307 if (requestData.Contains("owner"))
308 { 308 {
309 appearance = GetUserAppearance(new LLUUID((string) requestData["owner"])); 309 appearance = GetUserAppearance(new UUID((string) requestData["owner"]));
310 if (appearance == null) 310 if (appearance == null)
311 { 311 {
312 responseData = new Hashtable(); 312 responseData = new Hashtable();
@@ -337,7 +337,7 @@ namespace OpenSim.Grid.UserServer
337 if (requestData.Contains("owner")) 337 if (requestData.Contains("owner"))
338 { 338 {
339 AvatarAppearance appearance = new AvatarAppearance(requestData); 339 AvatarAppearance appearance = new AvatarAppearance(requestData);
340 UpdateUserAppearance(new LLUUID((string) requestData["owner"]), appearance); 340 UpdateUserAppearance(new UUID((string) requestData["owner"]), appearance);
341 responseData = new Hashtable(); 341 responseData = new Hashtable();
342 responseData["returnString"] = "TRUE"; 342 responseData["returnString"] = "TRUE";
343 } 343 }
@@ -396,7 +396,7 @@ namespace OpenSim.Grid.UserServer
396 { 396 {
397 try 397 try
398 { 398 {
399 LLUUID guess = new LLUUID((string) requestData["avatar_uuid"]); 399 UUID guess = new UUID((string) requestData["avatar_uuid"]);
400 400
401 userProfile = GetUserProfile(guess); 401 userProfile = GetUserProfile(guess);
402 } 402 }
@@ -427,11 +427,11 @@ namespace OpenSim.Grid.UserServer
427 //CFK: Console.WriteLine("METHOD BY UUID CALLED"); 427 //CFK: Console.WriteLine("METHOD BY UUID CALLED");
428 if (requestData.Contains("avatar_uuid")) 428 if (requestData.Contains("avatar_uuid"))
429 { 429 {
430 LLUUID guess; 430 UUID guess;
431 431
432 Helpers.TryParse((string) requestData["avatar_uuid"], out guess); 432 UUID.TryParse((string) requestData["avatar_uuid"], out guess);
433 433
434 if (guess == LLUUID.Zero) 434 if (guess == UUID.Zero)
435 { 435 {
436 return CreateUnknownUserErrorResponse(); 436 return CreateUnknownUserErrorResponse();
437 } 437 }
@@ -476,16 +476,16 @@ namespace OpenSim.Grid.UserServer
476 string authed = "FALSE"; 476 string authed = "FALSE";
477 if (requestData.Contains("avatar_uuid") && requestData.Contains("session_id")) 477 if (requestData.Contains("avatar_uuid") && requestData.Contains("session_id"))
478 { 478 {
479 LLUUID guess_aid; 479 UUID guess_aid;
480 LLUUID guess_sid; 480 UUID guess_sid;
481 481
482 Helpers.TryParse((string) requestData["avatar_uuid"], out guess_aid); 482 UUID.TryParse((string) requestData["avatar_uuid"], out guess_aid);
483 if (guess_aid == LLUUID.Zero) 483 if (guess_aid == UUID.Zero)
484 { 484 {
485 return CreateUnknownUserErrorResponse(); 485 return CreateUnknownUserErrorResponse();
486 } 486 }
487 Helpers.TryParse((string) requestData["session_id"], out guess_sid); 487 UUID.TryParse((string) requestData["session_id"], out guess_sid);
488 if (guess_sid == LLUUID.Zero) 488 if (guess_sid == UUID.Zero)
489 { 489 {
490 return CreateUnknownUserErrorResponse(); 490 return CreateUnknownUserErrorResponse();
491 } 491 }
@@ -520,7 +520,7 @@ namespace OpenSim.Grid.UserServer
520 return CreateUnknownUserErrorResponse(); 520 return CreateUnknownUserErrorResponse();
521 } 521 }
522 522
523 LLUUID UserUUID = new LLUUID((string) requestData["avatar_uuid"]); 523 UUID UserUUID = new UUID((string) requestData["avatar_uuid"]);
524 UserProfileData userProfile = GetUserProfile(UserUUID); 524 UserProfileData userProfile = GetUserProfile(UserUUID);
525 if (null == userProfile) 525 if (null == userProfile)
526 { 526 {
@@ -532,11 +532,11 @@ namespace OpenSim.Grid.UserServer
532 } 532 }
533 if (requestData.Contains("FLImageID")) 533 if (requestData.Contains("FLImageID"))
534 { 534 {
535 userProfile.FirstLifeImage = new LLUUID((string) requestData["FLImageID"]); 535 userProfile.FirstLifeImage = new UUID((string) requestData["FLImageID"]);
536 } 536 }
537 if (requestData.Contains("ImageID")) 537 if (requestData.Contains("ImageID"))
538 { 538 {
539 userProfile.Image = new LLUUID((string) requestData["ImageID"]); 539 userProfile.Image = new UUID((string) requestData["ImageID"]);
540 } 540 }
541 // dont' know how yet 541 // dont' know how yet
542 if (requestData.Contains("MaturePublish")) 542 if (requestData.Contains("MaturePublish"))
@@ -575,8 +575,8 @@ namespace OpenSim.Grid.UserServer
575 } 575 }
576 if (requestData.Contains("home_region_id")) 576 if (requestData.Contains("home_region_id"))
577 { 577 {
578 LLUUID regionID; 578 UUID regionID;
579 LLUUID.TryParse((string) requestData["home_region_id"], out regionID); 579 UUID.TryParse((string) requestData["home_region_id"], out regionID);
580 userProfile.HomeRegionID = regionID; 580 userProfile.HomeRegionID = regionID;
581 } 581 }
582 if (requestData.Contains("home_pos_x")) 582 if (requestData.Contains("home_pos_x"))
@@ -682,7 +682,7 @@ namespace OpenSim.Grid.UserServer
682 { 682 {
683 try 683 try
684 { 684 {
685 userProfile.Partner = new LLUUID((string) requestData["partner"]); 685 userProfile.Partner = new UUID((string) requestData["partner"]);
686 } 686 }
687 catch (InvalidCastException) 687 catch (InvalidCastException)
688 { 688 {
@@ -691,7 +691,7 @@ namespace OpenSim.Grid.UserServer
691 } 691 }
692 else 692 else
693 { 693 {
694 userProfile.Partner = LLUUID.Zero; 694 userProfile.Partner = UUID.Zero;
695 } 695 }
696 696
697 // call plugin! 697 // call plugin!
@@ -710,8 +710,8 @@ namespace OpenSim.Grid.UserServer
710 { 710 {
711 try 711 try
712 { 712 {
713 LLUUID userUUID = new LLUUID((string) requestData["avatar_uuid"]); 713 UUID userUUID = new UUID((string) requestData["avatar_uuid"]);
714 LLUUID RegionID = new LLUUID((string) requestData["region_uuid"]); 714 UUID RegionID = new UUID((string) requestData["region_uuid"]);
715 ulong regionhandle = (ulong) Convert.ToInt64((string) requestData["region_handle"]); 715 ulong regionhandle = (ulong) Convert.ToInt64((string) requestData["region_handle"]);
716 float posx = (float) Convert.ToDecimal((string) requestData["region_pos_x"]); 716 float posx = (float) Convert.ToDecimal((string) requestData["region_pos_x"]);
717 float posy = (float) Convert.ToDecimal((string) requestData["region_pos_y"]); 717 float posy = (float) Convert.ToDecimal((string) requestData["region_pos_y"]);
@@ -749,9 +749,9 @@ namespace OpenSim.Grid.UserServer
749 throw new Exception("The method or operation is not implemented."); 749 throw new Exception("The method or operation is not implemented.");
750 } 750 }
751 751
752 public override UserProfileData SetupMasterUser(LLUUID uuid) 752 public override UserProfileData SetupMasterUser(UUID uuid)
753 { 753 {
754 throw new Exception("The method or operation is not implemented."); 754 throw new Exception("The method or operation is not implemented.");
755 } 755 }
756 } 756 }
757} \ No newline at end of file 757}