Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 42 insertions, 24 deletions

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index cb3a5c8..3c61ee0 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -8,39 +8,59 @@
     Include-Common = "config-include/GridCommon.ini"
 
 [Modules]
-    AssetServices                       = "RemoteAssetServicesConnector"
-    InventoryServices           = "RemoteXInventoryServicesConnector"
-    GridServices                        = "RemoteGridServicesConnector"
-    AvatarServices                      = "RemoteAvatarServicesConnector"
-    NeighbourServices           = "RemoteNeighbourServicesConnector"
-    AuthenticationServices      = "RemoteAuthenticationServicesConnector"
-    AuthorizationServices       = "LocalAuthorizationServicesConnector"
-    PresenceServices            = "RemotePresenceServicesConnector"
-    UserAccountServices         = "RemoteUserAccountServicesConnector"
-    GridUserServices            = "RemoteGridUserServicesConnector"
-    SimulationServices          = "RemoteSimulationConnectorModule"
-    EntityTransferModule        = "BasicEntityTransferModule"
-    InventoryAccessModule       = "BasicInventoryAccessModule"
+    AssetServices           = "RemoteAssetServicesConnector"
+    InventoryServices       = "RemoteXInventoryServicesConnector"
+    GridServices            = "RemoteGridServicesConnector"
+    AvatarServices          = "RemoteAvatarServicesConnector"
+    NeighbourServices       = "RemoteNeighbourServicesConnector"
+    AuthenticationServices  = "RemoteAuthenticationServicesConnector"
+    AuthorizationServices   = "LocalAuthorizationServicesConnector"
+    PresenceServices        = "RemotePresenceServicesConnector"
+    UserAccountServices     = "RemoteUserAccountServicesConnector"
+    AgentPreferencesServices= "RemoteAgentPreferencesServicesConnector"
+    GridUserServices        = "RemoteGridUserServicesConnector"
+    SimulationServices      = "RemoteSimulationConnectorModule"
+    EntityTransferModule    = "BasicEntityTransferModule"
+    InventoryAccessModule   = "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
-        MapImageService                 = "MapImageServiceModule"
+    MapImageService         = "MapImageServiceModule"
+    SearchModule            = "BasicSearchModule"
     
-    LandServiceInConnector                      = true
-    NeighbourServiceInConnector         = true
-    SimulationServiceInConnector        = true
-    LibraryModule                                       = true
+    LandServiceInConnector        = true
+    NeighbourServiceInConnector   = true
+    SimulationServiceInConnector  = true
+    LibraryModule                 = true
+
+[SimulationService]
+    ; This is the protocol version which the simulator advertises to the source destination when acting as a target destination for a teleport
+    ; It is used to control the teleport handoff process.
+    ; Valid values are
+    ; "SIMULATION/0.3" 
+    ;   - This is the default, and it supports teleports to variable-sized regions
+    ;   - Older versions can teleport to this one, but only if the destination region
+    ;     is 256x256
+    ; "SIMULATION/0.2"
+    ;   - A source simulator which only implements "SIMULATION/0.1" can still teleport with that protocol
+    ;   - this protocol is more efficient than "SIMULATION/0.1"
+    ; "SIMULATION/0.1" 
+    ;   - this is an older teleport protocol used in OpenSimulator 0.7.5 and before.
+    ConnectorProtocolVersion = "SIMULATION/0.3"
 
 [SimulationDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:SimulationDataService"
+    LocalServiceModule = "OpenSim.Services.SimulationService.dll:SimulationDataService"
 
 [EstateDataStore]
-    LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataService"
+    LocalServiceModule = "OpenSim.Services.EstateService.dll:EstateDataService"
 
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     ; for the LocalGridServicesConnector which is used by the Remote one
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
+    NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
 
-        NetworkConnector = "OpenSim.Services.Connectors.dll:GridServicesConnector"
+    ; Because LocalGridServicesConnector starts this service, in grid mode we need to suppress
+    ; the inappropriate console commands that it registers.
+    SuppressConsoleCommands = true
     
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -51,6 +71,4 @@
     Connector = "OpenSim.Services.Connectors.dll:FriendsServicesConnector"
 
 [MapImageService]
-        LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"
-        ; in minutes
-        RefreshTime = 60
+    LocalServiceModule = "OpenSim.Services.Connectors.dll:MapImageServicesConnector"