Merge branch 'master' into careminster-presence-refactor

3 files changed, 19 insertions, 2 deletions

diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index 4ff1a26..bf89d0b 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -17,10 +17,12 @@
     AvatarServices          = "LocalAvatarServicesConnector"
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
+        MapImageService                 = "MapImageServiceModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
     GridInfoServiceInConnector = true
+        MapImageServiceInConnector = true
 
 [Profile]
     Module = "BasicProfileModule"
@@ -91,6 +93,11 @@
 
     WelcomeMessage = "Welcome, Avatar!"
 
+[MapImageService]
+        LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+        ; in minutes
+        RefreshTime = 60
+
 ;; This should always be the very last thing on this file
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 7359bba..29c2af1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -99,6 +99,9 @@
     SRV_FriendsServerURI = "http://127.0.0.1:9000"
     SRV_IMServerURI = "http://127.0.0.1:9000"
 
+        ;; For Viewer 2
+        MapTileURL = "http://127.0.0.1:9000/"
+
         ;; Regular expressions for controlling which client versions are accepted/denied.
         ;; An empty string means nothing is checked.
         ;;
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 8480a77..719df5c 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -18,9 +18,10 @@
     GridUserServices        = "LocalGridUserServicesConnector"
     SimulationServices          = "RemoteSimulationConnectorModule"
     AvatarServices                      = "LocalAvatarServicesConnector"
+        MapImageService                 = "MapImageServiceModule"
     EntityTransferModule        = "HGEntityTransferModule"
     InventoryAccessModule       = "HGInventoryAccessModule"
-    FriendsModule               = "HGFriendsModule"
+    FriendsModule                       = "HGFriendsModule"
     
     InventoryServiceInConnector                 = true
     AssetServiceInConnector                             = true
@@ -31,6 +32,7 @@
         GridInfoServiceInConnector                      = true
     AuthenticationServiceInConnector    = true
     SimulationServiceInConnector                = true
+        MapImageServiceInConnector                      = true
 
 [Profile]
     Module = "BasicProfileModule"
@@ -116,7 +118,12 @@
     GridService                         = "OpenSim.Services.GridService.dll:GridService"
     AvatarService                       = "OpenSim.Services.AvatarService.dll:AvatarService"
     FriendsService                      = "OpenSim.Services.FriendsService.dll:FriendsService"
-    
+   
+[MapImageService]
+        LocalServiceModule = "OpenSim.Services.MapImageService.dll:MapImageService"
+        ; in minutes
+        RefreshTime = 60
+
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
     ;; for the service