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.0.6.0-stable
parent
f6650d33cc
commit
339671afc6
|
@ -206,7 +206,7 @@ namespace OpenSim.Framework.Servers
|
||||||
|
|
||||||
EnhanceVersionInformation();
|
EnhanceVersionInformation();
|
||||||
|
|
||||||
m_log.Info("[STARTUP]: Version " + m_version + "\n");
|
m_log.Info("[STARTUP]: Version: " + m_version + "\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -395,14 +395,7 @@ namespace OpenSim.Framework.Servers
|
||||||
EntriesFile.Close();
|
EntriesFile.Close();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(buildVersion))
|
m_version += string.IsNullOrEmpty(buildVersion)? ".00000" : ("." + buildVersion + " ").Substring(0, 6);
|
||||||
{
|
|
||||||
m_version += ", SVN build r" + buildVersion;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_version += ", SVN build revision not available";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add operating system information if available
|
// Add operating system information if available
|
||||||
string OSString = "";
|
string OSString = "";
|
||||||
|
@ -421,7 +414,7 @@ namespace OpenSim.Framework.Servers
|
||||||
OSString = OSString.Substring(0, 45);
|
OSString = OSString.Substring(0, 45);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_version += ", OS " + OSString;
|
m_version += " (OS " + OSString + ")";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,6 +32,6 @@ namespace OpenSim
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class VersionInfo
|
public class VersionInfo
|
||||||
{
|
{
|
||||||
public readonly static string Version = "OpenSimulator trunk (post 0.5.9)";
|
public readonly static string Version = "OpenSimulator Server 0.5.9"; // stay with 27 chars (used in regioninfo)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
private int m_animationSequenceNumber = 1;
|
private int m_animationSequenceNumber = 1;
|
||||||
|
|
||||||
private byte[] m_channelVersion = Utils.StringToBytes("OpenSimulator 0.5"); // Dummy value needed by libSL
|
private byte[] m_channelVersion = Utils.StringToBytes("OpenSimulator Server"); // Dummy value needed by libSL
|
||||||
|
|
||||||
private Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>();
|
private Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>();
|
||||||
|
|
||||||
|
|
|
@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
private int m_incrementsof15seconds = 0;
|
private int m_incrementsof15seconds = 0;
|
||||||
private volatile bool m_backingup = false;
|
private volatile bool m_backingup = false;
|
||||||
|
|
||||||
protected string m_simulatorVersion = "unknown";
|
protected string m_simulatorVersion = "OpenSimulator Server";
|
||||||
|
|
||||||
protected ModuleLoader m_moduleLoader;
|
protected ModuleLoader m_moduleLoader;
|
||||||
protected StorageManager m_storageManager;
|
protected StorageManager m_storageManager;
|
||||||
|
|
|
@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
public virtual string GetSimulatorVersion()
|
public virtual string GetSimulatorVersion()
|
||||||
{
|
{
|
||||||
return "OpenSimulator v0.5 SVN";
|
return "OpenSimulator Server";
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
|
@ -7028,7 +7028,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
else
|
else
|
||||||
reply = "UNKNOWN";
|
reply = "UNKNOWN";
|
||||||
break;
|
break;
|
||||||
case 128: // SIM_RELEASE
|
case 128: // SIM_RELEASE (not LSL conform, valid for OpenSim only)
|
||||||
reply = m_ScriptEngine.World.GetSimulatorVersion();
|
reply = m_ScriptEngine.World.GetSimulatorVersion();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue