aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs46
1 files changed, 23 insertions, 23 deletions
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