diff options
author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
---|---|---|
committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /bin/config-include/Standalone.ini | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/config-include/Standalone.ini')
-rw-r--r-- | bin/config-include/Standalone.ini | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini index ba72fe7..424d8c8 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini | |||
@@ -19,12 +19,24 @@ | |||
19 | EntityTransferModule = "BasicEntityTransferModule" | 19 | EntityTransferModule = "BasicEntityTransferModule" |
20 | InventoryAccessModule = "BasicInventoryAccessModule" | 20 | InventoryAccessModule = "BasicInventoryAccessModule" |
21 | MapImageService = "MapImageServiceModule" | 21 | MapImageService = "MapImageServiceModule" |
22 | SearchModule = "BasicSearchModule" | ||
22 | 23 | ||
23 | LibraryModule = true | 24 | LibraryModule = true |
24 | LLLoginServiceInConnector = true | 25 | LLLoginServiceInConnector = true |
25 | GridInfoServiceInConnector = true | 26 | GridInfoServiceInConnector = true |
26 | MapImageServiceInConnector = true | 27 | MapImageServiceInConnector = true |
27 | 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 | |||
28 | [SimulationDataStore] | 40 | [SimulationDataStore] |
29 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" | 41 | LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService" |
30 | 42 | ||
@@ -105,9 +117,10 @@ | |||
105 | DSTZone = "America/Los_Angeles;Pacific Standard Time" | 117 | DSTZone = "America/Los_Angeles;Pacific Standard Time" |
106 | 118 | ||
107 | [MapImageService] | 119 | [MapImageService] |
108 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" | 120 | LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService" |
109 | ; in minutes | 121 | |
110 | RefreshTime = 60 | 122 | ; in minutes |
123 | RefreshTime = 60 | ||
111 | 124 | ||
112 | ;; This should always be the very last thing on this file | 125 | ;; This should always be the very last thing on this file |
113 | [Includes] | 126 | [Includes] |