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/VersionInfo.cs | |
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_OLD-72684592ba196095311b308407cbe5751c6dd8dd.zip opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.gz opensim-SC_OLD-72684592ba196095311b308407cbe5751c6dd8dd.tar.bz2 opensim-SC_OLD-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/VersionInfo.cs')
-rw-r--r-- | OpenSim/Framework/VersionInfo.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Framework/VersionInfo.cs b/OpenSim/Framework/VersionInfo.cs index 54c4508..a145d34 100644 --- a/OpenSim/Framework/VersionInfo.cs +++ b/OpenSim/Framework/VersionInfo.cs | |||
@@ -61,7 +61,9 @@ namespace OpenSim | |||
61 | /// This is the external interface version. It is separate from the OpenSimulator project version. | 61 | /// This is the external interface version. It is separate from the OpenSimulator project version. |
62 | /// | 62 | /// |
63 | /// </value> | 63 | /// </value> |
64 | public readonly static int MajorInterfaceVersion = 8; | 64 | /// Commented because it's not used anymore, see below for new |
65 | /// versioning method. | ||
66 | //public readonly static int MajorInterfaceVersion = 8; | ||
65 | 67 | ||
66 | /// <summary> | 68 | /// <summary> |
67 | /// This rules versioning regarding teleports, and compatibility between simulators in that regard. | 69 | /// This rules versioning regarding teleports, and compatibility between simulators in that regard. |
@@ -80,6 +82,9 @@ namespace OpenSim | |||
80 | /// "SIMULATION/0.1" | 82 | /// "SIMULATION/0.1" |
81 | /// - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. | 83 | /// - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. |
82 | /// </remarks> | 84 | /// </remarks> |
83 | public readonly static float SimulationServiceVersion = 0.3f; | 85 | public readonly static float SimulationServiceVersionAcceptedMin = 0.3f; |
86 | public readonly static float SimulationServiceVersionAcceptedMax = 0.4f; | ||
87 | public readonly static float SimulationServiceVersionSupportedMin = 0.3f; | ||
88 | public readonly static float SimulationServiceVersionSupportedMax = 0.4f; | ||
84 | } | 89 | } |
85 | } | 90 | } |