From 655aee44c4236d7023b9274645bf033b87b17131 Mon Sep 17 00:00:00 2001
From: "Justin Clark-Casey (justincc)" <jjustincc@googlemail.com>
Date: Sat, 22 Oct 2011 02:51:41 +0100
Subject: [PATCH] Rename some of the example commented out server names to
 mygridserver.com like all the others.

This is to make it easier to change all these names at once, where all grids services are running from the same location.
Also rearranges some lines in [Modules] so that StandaloneCommon.ini.example and GridCommon.ini.exmaple are consistent.
---
 bin/config-include/GridCommon.ini.example | 44 +++++++++++------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 72cd606ee1..e3682497fc 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -24,21 +24,39 @@
     ;StorageProvider = "OpenSim.Data.MSSQL.dll"
     ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
 
-[AssetService]
+[Modules]
+    ;; Choose one cache module and the corresponding config file, if it exists.
+    ;; Copy the config .example file into your own .ini file and adapt that.
+    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
 
+    AssetCaching = "FlotsamAssetCache"
+    Include-FlotsamCache = "config-include/FlotsamCache.ini"
+
+    ;AssetCaching = "CenomeMemoryAssetCache"
+    ;Include-CenomeCache = "config-include/CenomeCache.ini"
+
+    ;AssetCaching = "GlynnTuckerAssetCache"
+
+    ;; Optionally, the port for the LLProxyLoginModule module can be changed
+    ;Setup_LLProxyLoginModule = "9090/"
+
+    ;; Authorization is not on by default, as it depends on external php
+    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"
+
+[AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
     ;
     ; Change this to your grid-wide asset server.  Do not add a slash to the end of any of these addresses.
     ;
-    AssetServerURI = "http://myassetserver.com:8003"
+    AssetServerURI = "http://mygridserver.com:8003"
 
 [InventoryService]
     ;
     ; Change this to your grid-wide inventory server
     ;
-    InventoryServerURI = "http://myinventoryserver.com:8003"
+    InventoryServerURI = "http://mygridserver.com:8003"
 
 [GridService]
     ;
@@ -120,23 +138,3 @@
 
 [MapImageService]
    	MapImageServerURI = "http://mygridserver.com:8003"
-
-[Modules]
-    ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
-    ;; Copy the config .example file into your own .ini file and change configs there
-    ;; We recommend the use of the FlotsamAssetCache since this is most actively maintained.
-
-    AssetCaching = "FlotsamAssetCache"
-    Include-FlotsamCache = "config-include/FlotsamCache.ini"
-
-    ;AssetCaching = "CenomeMemoryAssetCache"
-    ;Include-CenomeCache = "config-include/CenomeCache.ini"
-
-    ;AssetCaching = "GlynnTuckerAssetCache"
-
-    ;; Optionally, the port for the LLProxyLoginModule module can be changed
-
-    ;Setup_LLProxyLoginModule = "9090/"
-
-    ;; Authorization is not on by default, as it depends on external php
-    ;AuthorizationServices = "RemoteAuthorizationServicesConnector"