From fd57c91b4a10cf7ee1e94dc8fe4e81eb0d5bae3d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 12 Jun 2011 15:37:42 -0700
Subject: First pass at making the V2 map work. Standalones only for now. There
 are some issues with the zoom level -- TBD.

---
 bin/config-include/Standalone.ini               |  7 +++++++
 bin/config-include/StandaloneCommon.ini.example |  3 +++
 bin/config-include/StandaloneHypergrid.ini      | 11 +++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'bin')

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..69349d2 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
-- 
cgit v1.1


From 07d7c1cd2d0d5ccf6d40a3616ecaeb565e9bfab4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 12 Jun 2011 18:29:44 -0700
Subject: Trailing / in MapTileURL must be there!

---
 bin/config-include/StandaloneCommon.ini.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 69349d2..29c2af1 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -100,7 +100,7 @@
     SRV_IMServerURI = "http://127.0.0.1:9000"
 
 	;; For Viewer 2
-	MapTileURL = "http://127.0.0.1:9000"
+	MapTileURL = "http://127.0.0.1:9000/"
 
 	;; Regular expressions for controlling which client versions are accepted/denied.
 	;; An empty string means nothing is checked.
-- 
cgit v1.1