diff options
| author | Melanie | 2013-08-07 23:29:42 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-07 23:29:42 +0100 |
| commit | 005c69511dac490a8353233423a3152abf5580dd (patch) | |
| tree | abae7717af4af3ed7844f3747ab28398fdad9cdf /bin/config-include/Standalone.ini | |
| parent | Merge branch 'avination-current' into careminster (diff) | |
| parent | minor: add some method doc to ScenePresence fields used for entity transfer, ... (diff) | |
| download | opensim-SC-005c69511dac490a8353233423a3152abf5580dd.zip opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.gz opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.bz2 opensim-SC-005c69511dac490a8353233423a3152abf5580dd.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin/config-include/Standalone.ini')
| -rw-r--r-- | bin/config-include/Standalone.ini | 11 |
1 files changed, 11 insertions, 0 deletions
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 | ||