From fe779128b0c50f44cf479444444754298d829910 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Fri, 6 Jun 2014 11:04:53 -0700 Subject: Added simulation version compatibility check so that agents coming from 0.7.6 to a varregion running in 0.8 and above will be denied teleport, rather than be allowed and crash the viewer. --- bin/config-include/Grid.ini | 10 +++++++--- bin/config-include/GridHypergrid.ini | 8 ++++++-- bin/config-include/Standalone.ini | 8 ++++++-- bin/config-include/StandaloneHypergrid.ini | 8 ++++++-- 4 files changed, 25 insertions(+), 9 deletions(-) (limited to 'bin') diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index e7141a1..419b40d 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -33,13 +33,17 @@ [SimulationService] ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport ; It is used to control the teleport handoff process. - ; Valid values are + ; Valid values are + ; "SIMULATION/0.3" + ; - This is the default, and it supports teleports to variable-sized regions + ; - Older versions can teleport to this one, but only if the destination region + ; is 256x256 ; "SIMULATION/0.2" - ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol + ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol ; - this protocol is more efficient than "SIMULATION/0.1" ; "SIMULATION/0.1" ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. - ConnectorProtocolVersion = "SIMULATION/0.2" + ConnectorProtocolVersion = "SIMULATION/0.3" [SimulationDataStore] LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 8f17527..27cc9d8 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -39,12 +39,16 @@ ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport ; It is used to control the teleport handoff process. ; Valid values are + ; "SIMULATION/0.3" + ; - This is the default, and it supports teleports to variable-sized regions + ; - Older versions can teleport to this one, but only if the destination region + ; is 256x256 ; "SIMULATION/0.2" - ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol + ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol ; - this protocol is more efficient than "SIMULATION/0.1" ; "SIMULATION/0.1" ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. - ConnectorProtocolVersion = "SIMULATION/0.2" + ConnectorProtocolVersion = "SIMULATION/0.3" [Profile] Module = "BasicProfileModule" diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index 0072be5..887f4d8 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -31,12 +31,16 @@ ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport ; It is used to control the teleport handoff process. ; Valid values are + ; "SIMULATION/0.3" + ; - This is the default, and it supports teleports to variable-sized regions + ; - Older versions can teleport to this one, but only if the destination region + ; is 256x256 ; "SIMULATION/0.2" - ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol + ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol ; - this protocol is more efficient than "SIMULATION/0.1" ; "SIMULATION/0.1" ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. - ConnectorProtocolVersion = "SIMULATION/0.2" + ConnectorProtocolVersion = "SIMULATION/0.3" [SimulationDataStore] LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index f39cf09..ccb80cb 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -42,12 +42,16 @@ ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport ; It is used to control the teleport handoff process. ; Valid values are + ; "SIMULATION/0.3" + ; - This is the default, and it supports teleports to variable-sized regions + ; - Older versions can teleport to this one, but only if the destination region + ; is 256x256 ; "SIMULATION/0.2" - ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol + ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol ; - this protocol is more efficient than "SIMULATION/0.1" ; "SIMULATION/0.1" ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. - ConnectorProtocolVersion = "SIMULATION/0.2" + ConnectorProtocolVersion = "SIMULATION/0.3" [Messaging] MessageTransferModule = HGMessageTransferModule -- cgit v1.1