diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Grid/GridServer | |
parent | * removed always true if (diff) | |
download | opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to 'OpenSim/Grid/GridServer')
-rw-r--r-- | OpenSim/Grid/GridServer/GridManager.cs | 17 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Main.cs | 4 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index cb9f979..65df708 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -434,8 +434,8 @@ namespace OpenSim.Grid.GridServer | |||
434 | } | 434 | } |
435 | else | 435 | else |
436 | { | 436 | { |
437 | MainLog.Instance.Verbose("DATA", "found " + (string)simData.regionName + " regionHandle = " + | 437 | MainLog.Instance.Verbose("DATA", "found " + (string) simData.regionName + " regionHandle = " + |
438 | (string)requestData["region_handle"]); | 438 | (string) requestData["region_handle"]); |
439 | responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString(); | 439 | responseData["sim_ip"] = Util.GetHostFromDNS(simData.serverIP).ToString(); |
440 | responseData["sim_port"] = simData.serverPort.ToString(); | 440 | responseData["sim_port"] = simData.serverPort.ToString(); |
441 | responseData["http_port"] = simData.httpPort.ToString(); | 441 | responseData["http_port"] = simData.httpPort.ToString(); |
@@ -513,7 +513,7 @@ namespace OpenSim.Grid.GridServer | |||
513 | simProfileList.Add(simProfileBlock); | 513 | simProfileList.Add(simProfileBlock); |
514 | } | 514 | } |
515 | MainLog.Instance.Verbose("MAP", "Fast map " + simProfileList.Count.ToString() + | 515 | MainLog.Instance.Verbose("MAP", "Fast map " + simProfileList.Count.ToString() + |
516 | " regions @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")" ); | 516 | " regions @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")"); |
517 | } | 517 | } |
518 | else | 518 | else |
519 | { | 519 | { |
@@ -548,7 +548,7 @@ namespace OpenSim.Grid.GridServer | |||
548 | } | 548 | } |
549 | } | 549 | } |
550 | MainLog.Instance.Verbose("MAP", "Std map " + simProfileList.Count.ToString() + | 550 | MainLog.Instance.Verbose("MAP", "Std map " + simProfileList.Count.ToString() + |
551 | " regions @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")"); | 551 | " regions @ (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")"); |
552 | } | 552 | } |
553 | 553 | ||
554 | responseData["sim-profiles"] = simProfileList; | 554 | responseData["sim-profiles"] = simProfileList; |
@@ -713,7 +713,8 @@ namespace OpenSim.Grid.GridServer | |||
713 | 713 | ||
714 | try | 714 | try |
715 | { | 715 | { |
716 | MainLog.Instance.Verbose("DATA", "Updating / adding via " + _plugins.Count + " storage provider(s) registered."); | 716 | MainLog.Instance.Verbose("DATA", |
717 | "Updating / adding via " + _plugins.Count + " storage provider(s) registered."); | ||
717 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) | 718 | foreach (KeyValuePair<string, IGridData> kvp in _plugins) |
718 | { | 719 | { |
719 | try | 720 | try |
@@ -733,14 +734,14 @@ namespace OpenSim.Grid.GridServer | |||
733 | { | 734 | { |
734 | MainLog.Instance.Warn("grid", | 735 | MainLog.Instance.Warn("grid", |
735 | "Unable to update region (RestSetSimMethod): Incorrect reservation auth key."); | 736 | "Unable to update region (RestSetSimMethod): Incorrect reservation auth key."); |
736 | // Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + "."); | 737 | // Wanted: " + reserveData.gridRecvKey + ", Got: " + TheSim.regionRecvKey + "."); |
737 | return "Unable to update region (RestSetSimMethod): Incorrect auth key."; | 738 | return "Unable to update region (RestSetSimMethod): Incorrect auth key."; |
738 | } | 739 | } |
739 | } | 740 | } |
740 | catch (Exception e) | 741 | catch (Exception e) |
741 | { | 742 | { |
742 | MainLog.Instance.Warn("GRID", "getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + | 743 | MainLog.Instance.Warn("GRID", "getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + |
743 | e.ToString()); | 744 | e.ToString()); |
744 | } | 745 | } |
745 | } | 746 | } |
746 | return "OK"; | 747 | return "OK"; |
@@ -751,4 +752,4 @@ namespace OpenSim.Grid.GridServer | |||
751 | } | 752 | } |
752 | } | 753 | } |
753 | } | 754 | } |
754 | } | 755 | } \ No newline at end of file |
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index 5bae6a6..cdd37c4 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs | |||
@@ -103,7 +103,7 @@ namespace OpenSim.Grid.GridServer | |||
103 | public void Startup() | 103 | public void Startup() |
104 | { | 104 | { |
105 | Cfg = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml"))); | 105 | Cfg = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml"))); |
106 | //Yeah srsly, that's it. | 106 | //Yeah srsly, that's it. |
107 | if (setuponly) Environment.Exit(0); | 107 | if (setuponly) Environment.Exit(0); |
108 | 108 | ||
109 | m_console.Verbose("GRID", "Connecting to Storage Server"); | 109 | m_console.Verbose("GRID", "Connecting to Storage Server"); |
@@ -218,4 +218,4 @@ namespace OpenSim.Grid.GridServer | |||
218 | } | 218 | } |
219 | }*/ | 219 | }*/ |
220 | } | 220 | } |
221 | } | 221 | } \ No newline at end of file |
diff --git a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs index 0399b3b..6f837e6 100644 --- a/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs +++ b/OpenSim/Grid/GridServer/Properties/AssemblyInfo.cs | |||
@@ -60,4 +60,4 @@ using System.Runtime.InteropServices; | |||
60 | // | 60 | // |
61 | 61 | ||
62 | [assembly : AssemblyVersion("1.0.0.0")] | 62 | [assembly : AssemblyVersion("1.0.0.0")] |
63 | [assembly : AssemblyFileVersion("1.0.0.0")] | 63 | [assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file |