diff options
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 12 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Main.cs | 8 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs | 2 |
3 files changed, 11 insertions, 11 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 |
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index 6bb4c75..d4947b3 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs | |||
@@ -149,7 +149,7 @@ namespace OpenSim.Grid.GridServer | |||
149 | /* | 149 | /* |
150 | foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values) | 150 | foreach (SimProfileBase sim in m_simProfileManager.SimProfiles.Values) |
151 | { | 151 | { |
152 | string SimResponse = ""; | 152 | string SimResponse = String.Empty; |
153 | try | 153 | try |
154 | { | 154 | { |
155 | WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/"); | 155 | WebRequest CheckSim = WebRequest.Create("http://" + sim.sim_ip + ":" + sim.sim_port.ToString() + "/checkstatus/"); |
@@ -158,7 +158,7 @@ namespace OpenSim.Grid.GridServer | |||
158 | CheckSim.ContentLength = 0; | 158 | CheckSim.ContentLength = 0; |
159 | 159 | ||
160 | StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII); | 160 | StreamWriter stOut = new StreamWriter(CheckSim.GetRequestStream(), System.Text.Encoding.ASCII); |
161 | stOut.Write(""); | 161 | stOut.Write(String.Empty); |
162 | stOut.Close(); | 162 | stOut.Close(); |
163 | 163 | ||
164 | StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream()); | 164 | StreamReader stIn = new StreamReader(CheckSim.GetResponse().GetResponseStream()); |
@@ -204,9 +204,9 @@ namespace OpenSim.Grid.GridServer | |||
204 | { | 204 | { |
205 | try | 205 | try |
206 | { | 206 | { |
207 | string attri = ""; | 207 | string attri = String.Empty; |
208 | attri = configData.GetAttribute("DataBaseProvider"); | 208 | attri = configData.GetAttribute("DataBaseProvider"); |
209 | if (attri == "") | 209 | if (attri == String.Empty) |
210 | { | 210 | { |
211 | GridDll = "OpenSim.Framework.Data.DB4o.dll"; | 211 | GridDll = "OpenSim.Framework.Data.DB4o.dll"; |
212 | configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); | 212 | configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll"); |
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs index 6f837e6..df06c90 100644 --- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs | |||
@@ -37,7 +37,7 @@ using System.Runtime.InteropServices; | |||
37 | [assembly : AssemblyConfiguration("")] | 37 | [assembly : AssemblyConfiguration("")] |
38 | [assembly : AssemblyCompany("")] | 38 | [assembly : AssemblyCompany("")] |
39 | [assembly : AssemblyProduct("OGS-GridServer")] | 39 | [assembly : AssemblyProduct("OGS-GridServer")] |
40 | [assembly : AssemblyCopyright("Copyright © 2007")] | 40 | [assembly : AssemblyCopyright("Copyright © OpenSimulator.org Developers 2007-2008")] |
41 | [assembly : AssemblyTrademark("")] | 41 | [assembly : AssemblyTrademark("")] |
42 | [assembly : AssemblyCulture("")] | 42 | [assembly : AssemblyCulture("")] |
43 | 43 | ||