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/Grid.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/Grid.ini')
| -rw-r--r-- | bin/config-include/Grid.ini | 11 |
1 files changed, 11 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 | ||