1 files changed, 21 insertions, 34 deletions

diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index af33860..58dcae9 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -1,3 +1,24 @@
+;;
+;; Please don't change this file.
+;; All optional settings are in GridCommon.ini.example,
+;; which you can copy and change.
+;;
+
+;;
+;; In GridCommon.ini, these are the URLs you would use if SimianGrid is 
+;; installed at http://www.mygrid.com/Grid/
+;;
+; AssetServerURI = "http://www.mygrid.com/Grid/?id="
+; InventoryServerURI = "http://www.mygrid.com/Grid/"
+; AvatarServerURI = "http://www.mygrid.com/Grid/"
+; PresenceServerURI = "http://www.mygrid.com/Grid/"
+; UserAccountServerURI = "http://www.mygrid.com/Grid/"
+; AuthenticationServerURI = "http://www.mygrid.com/Grid/"
+; FriendsServerURI = "http://www.mygrid.com/Grid/"
+
+[Includes]
+    Include-Common = "config-include/GridCommon.ini"
+
 [Modules]
     GridServices = "OpenSim.Services.Connectors.dll:SimianGridServiceConnector"
     PresenceServices = "OpenSim.Services.Connectors.dll:SimianPresenceServiceConnector"
@@ -25,7 +46,6 @@
 [GridService]
     LocalServiceModule = "OpenSim.Services.GridService.dll:GridService"
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
-    GridServerURI = "http://localhost/Grid/"
 
 [LibraryService]
     LocalServiceModule = "OpenSim.Services.InventoryService.dll:LibraryService"
@@ -35,36 +55,3 @@
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
-    AssetServerURI = "http://localhost/Grid/?id="
-
-[InventoryService]
-    InventoryServerURI = "http://localhost/Grid/"
-
-[AvatarService]
-    AvatarServerURI = "http://localhost/Grid/"
-
-[PresenceService]
-    PresenceServerURI = "http://localhost/Grid/"
-
-[UserAccountService]
-    UserAccountServerURI = "http://localhost/Grid/"
-
-[AuthenticationService]
-    AuthenticationServerURI = "http://localhost/Grid/"
-
-[FriendsService]
-    FriendsServerURI = "http://localhost/Grid/"
-
-[AssetCache]
-    CacheDirectory = ./assetcache
-    LogLevel = 0
-    HitRateDisplay = 100
-    MemoryCacheEnabled = false
-    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
-    MemoryCacheTimeout = 2
-    ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes
-    ; Specify 0 if you do not want your disk cache to expire
-    FileCacheTimeout = 0
-    ; How often {in hours} should the disk be checked for expired filed
-    ; Specify 0 to disable expiration checking
-    FileCleanupTimer = 0  ;roughly every 10 minutes