diff options
Diffstat (limited to '')
6 files changed, 8 insertions, 15 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 | } |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 3a90cff..e21bf7c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
86 | 86 | ||
87 | private int m_animationSequenceNumber = 1; | 87 | private int m_animationSequenceNumber = 1; |
88 | 88 | ||
89 | private byte[] m_channelVersion = Utils.StringToBytes("OpenSimulator 0.5"); // Dummy value needed by libSL | 89 | private byte[] m_channelVersion = Utils.StringToBytes("OpenSimulator Server"); // Dummy value needed by libSL |
90 | 90 | ||
91 | private Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>(); | 91 | private Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>(); |
92 | 92 | ||
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 5e1ad71..74502b8 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
98 | private int m_incrementsof15seconds = 0; | 98 | private int m_incrementsof15seconds = 0; |
99 | private volatile bool m_backingup = false; | 99 | private volatile bool m_backingup = false; |
100 | 100 | ||
101 | protected string m_simulatorVersion = "unknown"; | 101 | protected string m_simulatorVersion = "OpenSimulator Server"; |
102 | 102 | ||
103 | protected ModuleLoader m_moduleLoader; | 103 | protected ModuleLoader m_moduleLoader; |
104 | protected StorageManager m_storageManager; | 104 | protected StorageManager m_storageManager; |
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index 51909ad..955fd22 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
183 | 183 | ||
184 | public virtual string GetSimulatorVersion() | 184 | public virtual string GetSimulatorVersion() |
185 | { | 185 | { |
186 | return "OpenSimulator v0.5 SVN"; | 186 | return "OpenSimulator Server"; |
187 | } | 187 | } |
188 | 188 | ||
189 | #endregion | 189 | #endregion |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs index 16b4c50..320e878 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs | |||
@@ -7028,7 +7028,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7028 | else | 7028 | else |
7029 | reply = "UNKNOWN"; | 7029 | reply = "UNKNOWN"; |
7030 | break; | 7030 | break; |
7031 | case 128: // SIM_RELEASE | 7031 | case 128: // SIM_RELEASE (not LSL conform, valid for OpenSim only) |
7032 | reply = m_ScriptEngine.World.GetSimulatorVersion(); | 7032 | reply = m_ScriptEngine.World.GetSimulatorVersion(); |
7033 | break; | 7033 | break; |
7034 | default: | 7034 | default: |