diff options
Diffstat (limited to '')
-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 06a8021..87d04f8 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -308,7 +308,7 @@ namespace OpenSim.Framework.Servers | |||
308 | 308 | ||
309 | EnhanceVersionInformation(); | 309 | EnhanceVersionInformation(); |
310 | 310 | ||
311 | m_log.Info("[STARTUP]: OpenSimulator version: " + m_version + Environment.NewLine); | 311 | m_log.Info("[STARTUP]: Careminster version: " + m_version + Environment.NewLine); |
312 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and | 312 | // clr version potentially is more confusing than helpful, since it doesn't tell us if we're running under Mono/MS .NET and |
313 | // the clr version number doesn't match the project version number under Mono. | 313 | // the clr version number doesn't match the project version number under Mono. |
314 | //m_log.Info("[STARTUP]: Virtual machine runtime version: " + Environment.Version + Environment.NewLine); | 314 | //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 401dfd3..f5addc8 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1547,11 +1547,34 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1547 | 1547 | ||
1548 | internal void DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response) | 1548 | internal void DoHTTPGruntWork(Hashtable responsedata, OSHttpResponse response) |
1549 | { | 1549 | { |
1550 | //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response"); | 1550 | int responsecode; |
1551 | int responsecode = (int)responsedata["int_response_code"]; | 1551 | string responseString; |
1552 | string responseString = (string)responsedata["str_response_string"]; | 1552 | string contentType; |
1553 | string contentType = (string)responsedata["content_type"]; | ||
1554 | 1553 | ||
1554 | if (responsedata == null) | ||
1555 | { | ||
1556 | responsecode = 500; | ||
1557 | responseString = "No response could be obtained"; | ||
1558 | contentType = "text/plain"; | ||
1559 | responsedata = new Hashtable(); | ||
1560 | } | ||
1561 | else | ||
1562 | { | ||
1563 | try | ||
1564 | { | ||
1565 | //m_log.Info("[BASE HTTP SERVER]: Doing HTTP Grunt work with response"); | ||
1566 | responsecode = (int)responsedata["int_response_code"]; | ||
1567 | responseString = (string)responsedata["str_response_string"]; | ||
1568 | contentType = (string)responsedata["content_type"]; | ||
1569 | } | ||
1570 | catch | ||
1571 | { | ||
1572 | responsecode = 500; | ||
1573 | responseString = "No response could be obtained"; | ||
1574 | contentType = "text/plain"; | ||
1575 | responsedata = new Hashtable(); | ||
1576 | } | ||
1577 | } | ||
1555 | 1578 | ||
1556 | if (responsedata.ContainsKey("error_status_text")) | 1579 | if (responsedata.ContainsKey("error_status_text")) |
1557 | { | 1580 | { |
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index 5f01788..016a174 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.4"; | 32 | private const string VERSION_NUMBER = "0.7.4CM"; |
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, |
@@ -50,7 +50,7 @@ namespace OpenSim | |||
50 | 50 | ||
51 | public static string GetVersionString(string versionNumber, Flavour flavour) | 51 | public static string GetVersionString(string versionNumber, Flavour flavour) |
52 | { | 52 | { |
53 | string versionString = "OpenSim " + versionNumber + " " + flavour; | 53 | string versionString = "Careminster " + versionNumber + " " + flavour; |
54 | return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); | 54 | return versionString.PadRight(VERSIONINFO_VERSION_LENGTH); |
55 | } | 55 | } |
56 | 56 | ||