diff options
author | Adam Frisby | 2008-05-08 05:09:35 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-08 05:09:35 +0000 |
commit | 8a48516bcfcce1a49499d33db0e8eab2f59f7c1a (patch) | |
tree | ead8b2684a00546180dc5ccbcedbce48427faeb5 /OpenSim/Region/Application | |
parent | * Fixes Prim ExtraParams (diff) | |
download | opensim-SC_OLD-8a48516bcfcce1a49499d33db0e8eab2f59f7c1a.zip opensim-SC_OLD-8a48516bcfcce1a49499d33db0e8eab2f59f7c1a.tar.gz opensim-SC_OLD-8a48516bcfcce1a49499d33db0e8eab2f59f7c1a.tar.bz2 opensim-SC_OLD-8a48516bcfcce1a49499d33db0e8eab2f59f7c1a.tar.xz |
* Spring cleaning, round 3029
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMainConsole.cs | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 3a45f70..d349d37 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -26,6 +26,7 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Net; | ||
29 | using log4net.Config; | 30 | using log4net.Config; |
30 | using Nini.Config; | 31 | using Nini.Config; |
31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
@@ -137,7 +138,7 @@ namespace OpenSim | |||
137 | // System.Web.HttpUtility.UrlEncode(msg)); | 138 | // System.Web.HttpUtility.UrlEncode(msg)); |
138 | //wc.Dispose(); | 139 | //wc.Dispose(); |
139 | } | 140 | } |
140 | catch (Exception) | 141 | catch (WebException) |
141 | { | 142 | { |
142 | // Ignore | 143 | // Ignore |
143 | } | 144 | } |
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 735f662..adfddcb 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -351,7 +351,7 @@ namespace OpenSim | |||
351 | { | 351 | { |
352 | // Set BuildVersion String for Show version command | 352 | // Set BuildVersion String for Show version command |
353 | string svnFileName = "../.svn/entries"; | 353 | string svnFileName = "../.svn/entries"; |
354 | string inputLine = null; | 354 | string inputLine; |
355 | int strcmp; | 355 | int strcmp; |
356 | 356 | ||
357 | if (File.Exists(svnFileName)) | 357 | if (File.Exists(svnFileName)) |
@@ -375,7 +375,7 @@ namespace OpenSim | |||
375 | EntriesFile.Close(); | 375 | EntriesFile.Close(); |
376 | } | 376 | } |
377 | 377 | ||
378 | if ((buildVersion != null) && (buildVersion.Length > 0)) | 378 | if (!string.IsNullOrEmpty(buildVersion)) |
379 | { | 379 | { |
380 | m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + ", SVN build r" + buildVersion + "\n"); | 380 | m_log.Info("[STARTUP]: OpenSim version: " + VersionInfo.Version + ", SVN build r" + buildVersion + "\n"); |
381 | } | 381 | } |
diff --git a/OpenSim/Region/Application/OpenSimMainConsole.cs b/OpenSim/Region/Application/OpenSimMainConsole.cs index 2653273..c02095c 100644 --- a/OpenSim/Region/Application/OpenSimMainConsole.cs +++ b/OpenSim/Region/Application/OpenSimMainConsole.cs | |||
@@ -643,7 +643,7 @@ namespace OpenSim | |||
643 | break; | 643 | break; |
644 | 644 | ||
645 | case "version": | 645 | case "version": |
646 | if ((buildVersion != null) && (buildVersion.Length > 0)) | 646 | if (!string.IsNullOrEmpty(buildVersion)) |
647 | { | 647 | { |
648 | m_console.Notice("The build version is: r" + buildVersion); | 648 | m_console.Notice("The build version is: r" + buildVersion); |
649 | } | 649 | } |