aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-08-02 23:12:54 +0100
committerJustin Clark-Casey (justincc)2013-08-02 23:12:54 +0100
commit54b1071556edf264835f990bb3595064d2b2e2f0 (patch)
treebfa4a7a8e445d070cca956b190ba33a8a6edf21d /bin
parentminor: replace veclist.Add(new Vector3(0,0,0)) with Vector3.Zero in Inventory... (diff)
downloadopensim-SC_OLD-54b1071556edf264835f990bb3595064d2b2e2f0.zip
opensim-SC_OLD-54b1071556edf264835f990bb3595064d2b2e2f0.tar.gz
opensim-SC_OLD-54b1071556edf264835f990bb3595064d2b2e2f0.tar.bz2
opensim-SC_OLD-54b1071556edf264835f990bb3595064d2b2e2f0.tar.xz
Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be manually forced in a new [SimulationService] config setting.
This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not "SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol. Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
Diffstat (limited to 'bin')
-rw-r--r--bin/config-include/Grid.ini11
-rw-r--r--bin/config-include/Standalone.ini11
2 files changed, 22 insertions, 0 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 15ba55a..1837bdd 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -30,6 +30,17 @@
30 SimulationServiceInConnector = true 30 SimulationServiceInConnector = true
31 LibraryModule = true 31 LibraryModule = true
32 32
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
35 ; It is used to control the teleport handoff process.
36 ; Valid values are
37 ; "SIMULATION/0.2"
38 ; - this is the default. 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"
40 ; "SIMULATION/0.1"
41 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
42 ConnectorProtocolVersion = "SIMULATION/0.2"
43
33[SimulationDataStore] 44[SimulationDataStore]
34 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" 45 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
35 46
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index d3b9cb4..7b7beb2 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -26,6 +26,17 @@
26 GridInfoServiceInConnector = true 26 GridInfoServiceInConnector = true
27 MapImageServiceInConnector = true 27 MapImageServiceInConnector = true
28 28
29[SimulationService]
30 ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
31 ; It is used to control the teleport handoff process.
32 ; Valid values are
33 ; "SIMULATION/0.2"
34 ; - this is the default. A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
35 ; - this protocol is more efficient than "SIMULATION/0.1"
36 ; "SIMULATION/0.1"
37 ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
38 ConnectorProtocolVersion = "SIMULATION/0.2"
39
29[SimulationDataStore] 40[SimulationDataStore]
30 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" 41 LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
31 42