diff options
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 31 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 6 |
3 files changed, 31 insertions, 8 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index db063f1..3551d5d 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -304,7 +304,7 @@ namespace OpenSim.Framework.Servers | |||
304 | 304 | ||
305 | EnhanceVersionInformation(); | 305 | EnhanceVersionInformation(); |
306 | 306 | ||
307 | m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine); | 307 | m_log.Info("[STARTUP]: Careminster version: " + m_version + Environment.NewLine); |
308 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and | 308 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and |
309 | // the clr version number doesn't match the project version number under Mono. | 309 | // the clr version number doesn't match the project version number under Mono. |
310 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); | 310 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); |
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 3aed9a8..b45ed7b 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1510,11 +1510,34 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1510 | 1510 | ||
1511 | internal void DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response) | 1511 | internal void DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response) |
1512 | { | 1512 | { |
1513 | //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response"); | 1513 | int responsecode; |
1514 | int responsecode = (int)responsedata["int_response_code"]; | 1514 | string responseString; |
1515 | string responseString = (string)responsedata["str_response_string"]; | 1515 | string contentType; |
1516 | string contentType = (string)responsedata["content_type"]; | ||
1517 | 1516 | ||
1517 | if (responsedata == null) | ||
1518 | { | ||
1519 | responsecode = 500; | ||
1520 | responseString = "No response could be obtained"; | ||
1521 | contentType = "text/plain"; | ||
1522 | responsedata = new Hashtable(); | ||
1523 | } | ||
1524 | else | ||
1525 | { | ||
1526 | try | ||
1527 | { | ||
1528 | //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response"); | ||
1529 | responsecode = (int)responsedata["int_response_code"]; | ||
1530 | responseString = (string)responsedata["str_response_string"]; | ||
1531 | contentType = (string)responsedata["content_type"]; | ||
1532 | } | ||
1533 | catch | ||
1534 | { | ||
1535 | responsecode = 500; | ||
1536 | responseString = "No response could be obtained"; | ||
1537 | contentType = "text/plain"; | ||
1538 | responsedata = new Hashtable(); | ||
1539 | } | ||
1540 | } | ||
1518 | 1541 | ||
1519 | if (responsedata.ContainsKey("error_status_text")) | 1542 | if (responsedata.ContainsKey("error_status_text")) |
1520 | { | 1543 | { |
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index f30cb7a..b2bb962 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
@@ -29,11 +29,11 @@ namespace OpenSim | |||
29 | { | 29 | { |
30 | public class VersionInfo | 30 | public class VersionInfo |
31 | { | 31 | { |
32 | private const string VERSION_NUMBER = "0.7.3"; | 32 | private const string VERSION_NUMBER = "0.7.3CM"; |
33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
34 | 34 | ||
35 | public enum Flavour | 35 | public enum Flavour |
36 | { | 36 | { |
37 | Unknown, | 37 | Unknown, |
38 | Dev, | 38 | Dev, |
39 | RC1, | 39 | RC1, |
@@ -49,7 +49,7 @@ namespace OpenSim | |||
49 | 49 | ||
50 | public static string GetVersionString(string versionNumber, Flavour flavour) | 50 | public static string GetVersionString(string versionNumber, Flavour flavour) |
51 | { | 51 | { |
52 | string versionString = "OpenSim " + versionNumber + " " + flavour; | 52 | string versionString = "Careminster " + versionNumber + " " + flavour; |
53 | return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); | 53 | return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); |
54 | } | 54 | } |
55 | 55 | ||