diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Framework/Servers/ServerBase.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Framework/Servers/ServerBase.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index e403ba0..35177f4 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
| @@ -871,7 +871,7 @@ namespace OpenSim.Framework.Servers | |||
| 871 | } | 871 | } |
| 872 | } | 872 | } |
| 873 | 873 | ||
| 874 | protected string GetVersionText() | 874 | public string GetVersionText() |
| 875 | { | 875 | { |
| 876 | return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion); | 876 | return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion); |
| 877 | } | 877 | } |
| @@ -1044,4 +1044,4 @@ namespace OpenSim.Framework.Servers | |||
| 1044 | /// </summary> | 1044 | /// </summary> |
| 1045 | protected virtual void ShutdownSpecific() {} | 1045 | protected virtual void ShutdownSpecific() {} |
| 1046 | } | 1046 | } |
| 1047 | } \ No newline at end of file | 1047 | } |