diff options
| author | UbitUmarov | 2015-11-01 03:01:59 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-01 03:01:59 +0000 |
| commit | 72684592ba196095311b308407cbe5751c6dd8dd (patch) | |
| tree | c51a1fb67c6d425b1cb904e788bac8a720d951c8 /OpenSim/Framework/Servers | |
| parent | fix cut points of UTF-8 strings (diff) | |
| parent | Minor: Add an initializer to show what the default value would be. (diff) | |
| download | opensim-SC-72684592ba196095311b308407cbe5751c6dd8dd.zip opensim-SC-72684592ba196095311b308407cbe5751c6dd8dd.tar.gz opensim-SC-72684592ba196095311b308407cbe5751c6dd8dd.tar.bz2 opensim-SC-72684592ba196095311b308407cbe5751c6dd8dd.tar.xz | |
Merge branch 'master' into avinationmerge
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
Diffstat (limited to 'OpenSim/Framework/Servers')
| -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 6e089ca..b330384 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
| @@ -873,8 +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}, SIMULATION/{2})", | 876 | return String.Format("Version: {0} (SIMULATION/{1} - SIMULATION/{2})", |
| 877 | m_version, VersionInfo.MajorInterfaceVersion, VersionInfo.SimulationServiceVersion); | 877 | m_version, VersionInfo.SimulationServiceVersionSupportedMin, VersionInfo.SimulationServiceVersionSupportedMax); |
| 878 | } | 878 | } |
| 879 | 879 | ||
| 880 | /// <summary> | 880 | /// <summary> |