aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/GridServer/GridManager.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid/GridServer/GridManager.cs')
-rw-r--r--OpenSim/Grid/GridServer/GridManager.cs12
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 1e21d9e..b4b91bb 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -194,7 +194,7 @@ namespace OpenSim.Grid.GridServer
194 /// <returns>An XML string containing neighbour entities</returns> 194 /// <returns>An XML string containing neighbour entities</returns>
195 public string GetXMLNeighbours(ulong reqhandle) 195 public string GetXMLNeighbours(ulong reqhandle)
196 { 196 {
197 string response = ""; 197 string response = String.Empty;
198 RegionProfileData central_region = getRegion(reqhandle); 198 RegionProfileData central_region = getRegion(reqhandle);
199 RegionProfileData neighbour; 199 RegionProfileData neighbour;
200 for (int x = -1; x < 2; x++) 200 for (int x = -1; x < 2; x++)
@@ -241,7 +241,7 @@ namespace OpenSim.Grid.GridServer
241 { 241 {
242 TheSim = getRegion(new LLUUID((string)requestData["UUID"])); 242 TheSim = getRegion(new LLUUID((string)requestData["UUID"]));
243 243
244 // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod","", 5,"Region attempting login with UUID."); 244 // logToDB((new LLUUID((string)requestData["UUID"])).ToString(),"XmlRpcSimulatorLoginMethod",String.Empty, 5,"Region attempting login with UUID.");
245 } 245 }
246 else 246 else
247 { 247 {
@@ -615,7 +615,7 @@ namespace OpenSim.Grid.GridServer
615 /// <returns></returns> 615 /// <returns></returns>
616 public string RestGetRegionMethod(string request, string path, string param) 616 public string RestGetRegionMethod(string request, string path, string param)
617 { 617 {
618 return RestGetSimMethod("", "/sims/", param); 618 return RestGetSimMethod(String.Empty, "/sims/", param);
619 } 619 }
620 620
621 /// <summary> 621 /// <summary>
@@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer
627 /// <returns></returns> 627 /// <returns></returns>
628 public string RestSetRegionMethod(string request, string path, string param) 628 public string RestSetRegionMethod(string request, string path, string param)
629 { 629 {
630 return RestSetSimMethod("", "/sims/", param); 630 return RestSetSimMethod(String.Empty, "/sims/", param);
631 } 631 }
632 632
633 /// <summary> 633 /// <summary>
@@ -704,7 +704,7 @@ namespace OpenSim.Grid.GridServer
704 TheSim.regionRecvKey = config.SimRecvKey; 704 TheSim.regionRecvKey = config.SimRecvKey;
705 TheSim.regionSendKey = config.SimSendKey; 705 TheSim.regionSendKey = config.SimSendKey;
706 TheSim.regionSecret = config.SimRecvKey; 706 TheSim.regionSecret = config.SimRecvKey;
707 TheSim.regionDataURI = ""; 707 TheSim.regionDataURI = String.Empty;
708 TheSim.regionAssetURI = config.DefaultAssetServer; 708 TheSim.regionAssetURI = config.DefaultAssetServer;
709 TheSim.regionAssetRecvKey = config.AssetRecvKey; 709 TheSim.regionAssetRecvKey = config.AssetRecvKey;
710 TheSim.regionAssetSendKey = config.AssetSendKey; 710 TheSim.regionAssetSendKey = config.AssetSendKey;
@@ -776,7 +776,7 @@ namespace OpenSim.Grid.GridServer
776 { 776 {
777 kvp.Value.AddProfile(TheSim); 777 kvp.Value.AddProfile(TheSim);
778 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")"); 778 MainLog.Instance.Verbose("grid", "New sim added to grid (" + TheSim.regionName + ")");
779 logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", "", 5, 779 logToDB(TheSim.UUID.ToString(), "RestSetSimMethod", String.Empty, 5,
780 "Region successfully updated and connected to grid."); 780 "Region successfully updated and connected to grid.");
781 } 781 }
782 else 782 else