diff options
| author | Diva Canto | 2015-10-18 16:06:31 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-10-18 16:24:33 -0700 |
| commit | 7ab633461ed65d1080b569532020379a068352b5 (patch) | |
| tree | ec1efcb5e8d207e62b494f4d3ce404d6d61e1aaf /OpenSim/Framework/Servers/ServerBase.cs | |
| parent | The protocol version checking on the grid server connector seemed to have a b... (diff) | |
| download | opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.zip opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.gz opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.bz2 opensim-SC_OLD-7ab633461ed65d1080b569532020379a068352b5.tar.xz | |
Fixed merge conflicts
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
Diffstat (limited to 'OpenSim/Framework/Servers/ServerBase.cs')
| -rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 35177f4..6e089ca 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
| @@ -873,7 +873,8 @@ namespace OpenSim.Framework.Servers | |||
| 873 | 873 | ||
| 874 | public 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}, SIMULATION/{2})", |
| 877 | m_version, VersionInfo.MajorInterfaceVersion, VersionInfo.SimulationServiceVersion); | ||
| 877 | } | 878 | } |
| 878 | 879 | ||
| 879 | /// <summary> | 880 | /// <summary> |