Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

5 files changed, 25 insertions, 7 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index c690e06..9adf1ac 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -68,6 +68,12 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ;; Perform distance check for the creation of a linked region
     ; Check4096 = "True"
 
+    ;; Needed to display non-default map tile images for linked regions
+    AssetService = "OpenSim.Services.AssetService.dll:AssetService"
+
+    ;; Directory for map tile images of linked regions
+    ; MapTileDirectory = "./"
+ 
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegionName> = "<flags>"
     ;; or:            Region_<RegionID> = "<flags>"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 1122cbd..761e5eb 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -42,6 +42,9 @@
     GridServerURI = "http://mygridserver.com:8003"
     ;AllowHypergridMapSearch = true
 
+    ;; Directory for map tile images of linked regions
+    ; MapTileDirectory = "./"
+
 [AvatarService]
     ;
     ; change this to your grid-wide grid server
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 409b2a9..e983755 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -44,12 +44,15 @@
     LocalGridInventoryService = "OpenSim.Region.CoreModules.dll:RemoteXInventoryServicesConnector"
 
 [GridService]
-        ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
-        ; which in turn uses this
+    ; RemoteGridServicesConnector instantiates a LocalGridServicesConnector,
+    ; which in turn uses this
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
 
-        AllowHypergridMapSearch = true
+    ; Needed to display non-default map tile images for linked regions
+    AssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector"
+
+    AllowHypergridMapSearch = true
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 58059f5..4956bc3 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -65,6 +65,9 @@
     ;; With hypergrid, perform distance check for the creation of a linked region
     ; Check4096 = true
 
+    ;; Directory for map tile images of remote regions
+    ; MapTileDirectory = "./"
+
     ;; Next, we can specify properties of regions, including default and fallback regions
     ;; The syntax is: Region_<RegioName> = "<flags>"
     ;; where <flags> can be DefaultRegion, FallbackRegion, NoDirectLogin, Persistent, LockedOut
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 68aa739..486f22e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -65,12 +65,15 @@
     LocalServiceModule = "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService"
 
 [GridService]
-        ; LocalGridServicesConnector needs this
-        LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
-        Realm = "regions"
+    ; LocalGridServicesConnector needs this
+    LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
+    Realm = "regions"
     StorageProvider = "OpenSim.Data.Null.dll"
         
-        AllowHypergridMapSearch = true
+    ; Needed to display non-default map tile images for remote regions
+    AssetService = "OpenSim.Services.AssetService.dll:AssetService"
+  
+    AllowHypergridMapSearch = true
         
 [PresenceService]
     LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"