aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorCharles Krinke2008-09-25 14:57:40 +0000
committerCharles Krinke2008-09-25 14:57:40 +0000
commit339671afc67f9b6ce036733b7b746c572d78ddc3 (patch)
treeac3fd0b65a9a195151ec9990c0bcfab7b1c77686 /OpenSim/Region
parentFixes an exception that is seen on regions running XEngine, where DNE (diff)
downloadopensim-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/Region')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs2
4 files changed, 4 insertions, 4 deletions
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: