aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2014-06-06 11:04:53 -0700
committerDiva Canto2014-06-06 11:04:53 -0700
commitfe779128b0c50f44cf479444444754298d829910 (patch)
tree5323ae27955f5bba00624e4d7c3e76b6374cb80f /bin
parentBetter comment regarding SizeX and SizeY (diff)
downloadopensim-SC-fe779128b0c50f44cf479444444754298d829910.zip
opensim-SC-fe779128b0c50f44cf479444444754298d829910.tar.gz
opensim-SC-fe779128b0c50f44cf479444444754298d829910.tar.bz2
opensim-SC-fe779128b0c50f44cf479444444754298d829910.tar.xz
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.
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/Grid.ini10
-rw-r--r--bin/config-include/GridHypergrid.ini8
-rw-r--r--bin/config-include/Standalone.ini8
-rw-r--r--bin/config-include/StandaloneHypergrid.ini8
4 files changed, 25 insertions, 9 deletions
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 @@
33[SimulationService] 33[SimulationService]
34 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport 34 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
35 ; It is used to control the teleport handoff process. 35 ; It is used to control the teleport handoff process.
36 ; Valid values are 36 ; Valid values are
37 ; "SIMULATION/0.3"
38 ; - This is the default, and it supports teleports to variable-sized regions
39 ; - Older versions can teleport to this one, but only if the destination region
40 ; is 256x256
37 ; "SIMULATION/0.2" 41 ; "SIMULATION/0.2"
38 ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 42 ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
39 ; - this protocol is more efficient than "SIMULATION/0.1" 43 ; - this protocol is more efficient than "SIMULATION/0.1"
40 ; "SIMULATION/0.1" 44 ; "SIMULATION/0.1"
41 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. 45 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
42 ConnectorProtocolVersion = "SIMULATION/0.2" 46 ConnectorProtocolVersion = "SIMULATION/0.3"
43 47
44[SimulationDataStore] 48[SimulationDataStore]
45 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" 49 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 @@
39 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport 39 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
40 ; It is used to control the teleport handoff process. 40 ; It is used to control the teleport handoff process.
41 ; Valid values are 41 ; Valid values are
42 ; "SIMULATION/0.3"
43 ; - This is the default, and it supports teleports to variable-sized regions
44 ; - Older versions can teleport to this one, but only if the destination region
45 ; is 256x256
42 ; "SIMULATION/0.2" 46 ; "SIMULATION/0.2"
43 ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 47 ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
44 ; - this protocol is more efficient than "SIMULATION/0.1" 48 ; - this protocol is more efficient than "SIMULATION/0.1"
45 ; "SIMULATION/0.1" 49 ; "SIMULATION/0.1"
46 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. 50 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
47 ConnectorProtocolVersion = "SIMULATION/0.2" 51 ConnectorProtocolVersion = "SIMULATION/0.3"
48 52
49[Profile] 53[Profile]
50 Module = "BasicProfileModule" 54 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 @@
31 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport 31 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
32 ; It is used to control the teleport handoff process. 32 ; It is used to control the teleport handoff process.
33 ; Valid values are 33 ; Valid values are
34 ; "SIMULATION/0.3"
35 ; - This is the default, and it supports teleports to variable-sized regions
36 ; - Older versions can teleport to this one, but only if the destination region
37 ; is 256x256
34 ; "SIMULATION/0.2" 38 ; "SIMULATION/0.2"
35 ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 39 ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
36 ; - this protocol is more efficient than "SIMULATION/0.1" 40 ; - this protocol is more efficient than "SIMULATION/0.1"
37 ; "SIMULATION/0.1" 41 ; "SIMULATION/0.1"
38 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. 42 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
39 ConnectorProtocolVersion = "SIMULATION/0.2" 43 ConnectorProtocolVersion = "SIMULATION/0.3"
40 44
41[SimulationDataStore] 45[SimulationDataStore]
42 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" 46 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 @@
42 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport 42 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
43 ; It is used to control the teleport handoff process. 43 ; It is used to control the teleport handoff process.
44 ; Valid values are 44 ; Valid values are
45 ; "SIMULATION/0.3"
46 ; - This is the default, and it supports teleports to variable-sized regions
47 ; - Older versions can teleport to this one, but only if the destination region
48 ; is 256x256
45 ; "SIMULATION/0.2" 49 ; "SIMULATION/0.2"
46 ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol 50 ; - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
47 ; - this protocol is more efficient than "SIMULATION/0.1" 51 ; - this protocol is more efficient than "SIMULATION/0.1"
48 ; "SIMULATION/0.1" 52 ; "SIMULATION/0.1"
49 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. 53 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
50 ConnectorProtocolVersion = "SIMULATION/0.2" 54 ConnectorProtocolVersion = "SIMULATION/0.3"
51 55
52[Messaging] 56[Messaging]
53 MessageTransferModule = HGMessageTransferModule 57 MessageTransferModule = HGMessageTransferModule