diff options
author | Charles Krinke | 2008-09-25 14:57:40 +0000 |
---|---|---|
committer | Charles Krinke | 2008-09-25 14:57:40 +0000 |
commit | 339671afc67f9b6ce036733b7b746c572d78ddc3 (patch) | |
tree | ac3fd0b65a9a195151ec9990c0bcfab7b1c77686 /OpenSim/Framework | |
parent | Fixes an exception that is seen on regions running XEngine, where DNE (diff) | |
download | opensim-SC-339671afc67f9b6ce036733b7b746c572d78ddc3.zip opensim-SC-339671afc67f9b6ce036733b7b746c572d78ddc3.tar.gz opensim-SC-339671afc67f9b6ce036733b7b746c572d78ddc3.tar.bz2 opensim-SC-339671afc67f9b6ce036733b7b746c572d78ddc3.tar.xz |
Mantis#2017. Thank you kindly, Tyre, for a patch that solves:
Check the client dialog box (from top menu) WORLD / REGION ESTATE
/ REGION tab. The client dialog box seems to have a hard limit of
about 32 characters per line available for displaying the region
version number. Our regions are sending a string which is greater
than the limit, causing the client to wrap the text and look ugly.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 13 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 2018d55..e799c23 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.Servers | |||
206 | 206 | ||
207 | EnhanceVersionInformation(); | 207 | EnhanceVersionInformation(); |
208 | 208 | ||
209 | m_log.Info("[STARTUP]: Version " + m_version + "\n"); | 209 | m_log.Info("[STARTUP]: Version: " + m_version + "\n"); |
210 | } | 210 | } |
211 | 211 | ||
212 | /// <summary> | 212 | /// <summary> |
@@ -395,14 +395,7 @@ namespace OpenSim.Framework.Servers | |||
395 | EntriesFile.Close(); | 395 | EntriesFile.Close(); |
396 | } | 396 | } |
397 | 397 | ||
398 | if (!string.IsNullOrEmpty(buildVersion)) | 398 | m_version += string.IsNullOrEmpty(buildVersion)? ".00000" : ("." + buildVersion + " ").Substring(0, 6); |
399 | { | ||
400 | m_version += ", SVN build r" + buildVersion; | ||
401 | } | ||
402 | else | ||
403 | { | ||
404 | m_version += ", SVN build revision not available"; | ||
405 | } | ||
406 | 399 | ||
407 | // Add operating system information if available | 400 | // Add operating system information if available |
408 | string OSString = ""; | 401 | string OSString = ""; |
@@ -421,7 +414,7 @@ namespace OpenSim.Framework.Servers | |||
421 | OSString = OSString.Substring(0, 45); | 414 | OSString = OSString.Substring(0, 45); |
422 | } | 415 | } |
423 | 416 | ||
424 | m_version += ", OS " + OSString; | 417 | m_version += " (OS " + OSString + ")"; |
425 | } | 418 | } |
426 | } | 419 | } |
427 | } | 420 | } |
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index d206fc3..ed3f2a5 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
@@ -32,6 +32,6 @@ namespace OpenSim | |||
32 | /// </summary> | 32 | /// </summary> |
33 | public class VersionInfo | 33 | public class VersionInfo |
34 | { | 34 | { |
35 | public readonly static string Version = "OpenSimulator trunk (post 0.5.9)"; | 35 | public readonly static string Version = "OpenSimulator Server 0.5.9"; // stay with 27 chars (used in regioninfo) |
36 | } | 36 | } |
37 | } | 37 | } |