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/GridHypergrid.ini | |
parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC-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/GridHypergrid.ini')
-rw-r--r-- | bin/config-include/GridHypergrid.ini | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index 31a4059..2a66b4c 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini | |||
@@ -25,15 +25,27 @@ | |||
25 | EntityTransferModule = "HGEntityTransferModule" | 25 | EntityTransferModule = "HGEntityTransferModule" |
26 | InventoryAccessModule = "HGInventoryAccessModule" | 26 | InventoryAccessModule = "HGInventoryAccessModule" |
27 | LandServices = "RemoteLandServicesConnector" | 27 | LandServices = "RemoteLandServicesConnector" |
28 | FriendsModule = "HGFriendsModule" | 28 | FriendsModule = "HGFriendsModule" |
29 | MapImageService = "MapImageServiceModule" | 29 | MapImageService = "MapImageServiceModule" |
30 | UserManagementModule = "HGUserManagementModule" | 30 | UserManagementModule = "HGUserManagementModule" |
31 | SearchModule = "BasicSearchModule" | ||
31 | 32 | ||
32 | LandServiceInConnector = true | 33 | LandServiceInConnector = true |
33 | NeighbourServiceInConnector = true | 34 | NeighbourServiceInConnector = true |
34 | SimulationServiceInConnector = true | 35 | SimulationServiceInConnector = true |
35 | LibraryModule = true | 36 | LibraryModule = true |
36 | 37 | ||
38 | [SimulationService] | ||
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. | ||
41 | ; Valid values are | ||
42 | ; "SIMULATION/0.2" | ||
43 | ; - this is the default. 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" | ||
45 | ; "SIMULATION/0.1" | ||
46 | ; - this is an older teleport protocol used in OpenSimulator 0.7.5 and before. | ||
47 | ConnectorProtocolVersion = "SIMULATION/0.2" | ||
48 | |||
37 | [Profile] | 49 | [Profile] |
38 | Module = "BasicProfileModule" | 50 | Module = "BasicProfileModule" |
39 | 51 | ||
@@ -61,7 +73,7 @@ | |||
61 | ; Needed to display non-default map tile images for linked regions | 73 | ; Needed to display non-default map tile images for linked regions |
62 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" | 74 | AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" |
63 | 75 | ||
64 | HypergridLinker = true | 76 | HypergridLinker = true |
65 | AllowHypergridMapSearch = true | 77 | AllowHypergridMapSearch = true |
66 | 78 | ||
67 | [LibraryService] | 79 | [LibraryService] |
@@ -77,12 +89,13 @@ | |||
77 | LureModule = HGLureModule | 89 | LureModule = HGLureModule |
78 | 90 | ||
79 | [HGInstantMessageService] | 91 | [HGInstantMessageService] |
80 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" | 92 | LocalServiceModule = "OpenSim.Services.HypergridService.dll:HGInstantMessageService" |
81 | GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector" | 93 | GridService = "OpenSim.Services.Connectors.dll:GridServicesConnector" |
82 | PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector" | 94 | PresenceService = "OpenSim.Services.Connectors.dll:PresenceServicesConnector" |
83 | UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector" | 95 | UserAgentService = "OpenSim.Services.Connectors.dll:UserAgentServiceConnector" |
84 | 96 | ||
85 | [MapImageService] | 97 | [MapImageService] |
86 | LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" | 98 | LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector" |
87 | ; in minutes | 99 | |
88 | RefreshTime = 60 | 100 | ; in minutes |
101 | RefreshTime = 60 | ||