3 files changed, 328 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 21f3d45..9863bb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,8 +68,6 @@ caches/maptiles
 bin/bakes
 bin/estate_settings.xml
 config/config-include/CenomeCache.ini
-config/config-include/FlotsamCache.ini
-config/config-include/GridCommon.ini
 config/config-include/StandaloneCommon.ini
 logs/OpenSim.Grid.AssetInventoryServer.log
 logs/OpenSim.Grid.AssetServer.log
diff --git a/config/config-include/FlotsamCache.ini b/config/config-include/FlotsamCache.ini
new file mode 100644
index 0000000..507521f
--- /dev/null
+++ b/config/config-include/FlotsamCache.ini
@@ -0,0 +1,56 @@
+[AssetCache]
+    ;;
+    ;; Options for FlotsamAssetCache
+    ;;
+
+    ; cache directory can be shared by multiple instances
+    CacheDirectory = "${Const|CachePath}/assetcache"
+    ; Other examples:
+    ;CacheDirectory = /directory/writable/by/OpenSim/instance
+
+    ; Log level
+    ; 0 - (Error) Errors only
+    ; 1 - (Info)  Hit Rate Stats + Level 0
+    ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1
+    ;
+    LogLevel = 0
+
+    ; How often should hit rates be displayed (given in AssetRequests)
+    ; 0 to disable
+    HitRateDisplay = 0
+
+    ; Set to false for no memory cache
+    MemoryCacheEnabled = false
+
+    ; Set to false for no file cache
+    FileCacheEnabled = true
+
+    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    ; Optimization: for VPS or limited memory system installs set Timeout to .016 (1 minute)
+    ; increases performance without large memory impact
+    MemoryCacheTimeout = 0.5
+
+    ; 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.5
+
+    ; How often {in hours} should the disk be checked for expired filed
+    ; Specify 0 to disable expiration checking
+    FileCleanupTimer = 1.0  ;every hour
+
+    ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how
+    ; long (in miliseconds) to block a request thread while trying to complete
+    ; an existing write to disk.
+    ; NOTE: THIS PARAMETER IS NOT CURRENTLY USED BY THE CACHE
+    ; WaitOnInprogressTimeout = 3000
+
+    ; Number of tiers to use for cache directories (current valid
+    ; range 1 to 3)
+    ;CacheDirectoryTiers = 1
+
+    ; Number of letters per path tier, 1 will create 16 directories
+    ; per tier, 2 - 256, 3 - 4096 and 4 - 65K
+    ;CacheDirectoryTierLength = 3
+
+    ; Warning level for cache directory size
+    ;CacheWarnAt = 30000
diff --git a/config/config-include/GridCommon.ini b/config/config-include/GridCommon.ini
new file mode 100644
index 0000000..1281aee
--- /dev/null
+++ b/config/config-include/GridCommon.ini
@@ -0,0 +1,272 @@
+; This is the main configuration file for an instance of OpenSim running in grid mode
+; In particular, this one is set up for connecting to Infinite Grid.
+
+[DatabaseService]
+    ;
+    ; ### Choose the DB
+    ;
+
+    ; SQLite
+    ; Include-Storage = "config-include/storage/SQLiteStandalone.ini";
+
+    ; MySql
+    ; Uncomment these lines if you want to use mysql storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.MySQL.dll"
+    ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+    ; Uncomment this line if you are using MySQL and want to use a different database for estates
+    ; The usual application for this is to allow estates to be spread out across multiple simulators by share the same database.
+    ; Most people won't need to do this so only uncomment if you know what you're doing.
+    ;EstateConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;Old Guids=true;"
+
+    ; MSSQL
+    ; Uncomment these lines if you want to use MSSQL storage
+    ; Change the connection string to your db details
+    ; The value for server property is shown in your SQL Server Management Studio login dialog.
+    ; (This sample is the default of express edition)
+    ;StorageProvider = "OpenSim.Data.MSSQL.dll"
+    ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
+
+    ; PGSQL
+    ; Uncomment these lines if you want to use PGSQL storage
+    ; Change the connection string to your db details
+    ;StorageProvider = "OpenSim.Data.PGSQL.dll"
+    ;ConnectionString = "Server=localhost;Database=opensim;User Id=opensim; password=***;"
+
+    StorageProvider = "${Const|DataProvider}"
+    ConnectionString = "${Const|ConnectionString}"
+
+
+[Hypergrid]
+    ; Uncomment the variables in this section only if you are in
+    ; Hypergrid configuration. Otherwise, ignore.
+
+    ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server that
+    ;; runs the UserAgentsService.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; HomeURI = "${Const|GridURL}:${Const|PublicPort}"
+
+    ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
+    ;; If this is a standalone world, this is the address of this instance.
+    ;; If this is a grided simulator, this is the address of the external robust server
+    ;; that runs the Gatekeeper service.
+    ;; For example http://myworld.com:9000 or http://myworld.com:8002
+    ;; This is a default that can be overwritten in some sections.
+    ; GatekeeperURI = "${Const|GridURL}:${Const|PublicPort}"
+
+[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.
+    ; I think only Windows needs caching, haven't noticed any difference under Linux, which uses spare memory for file caching anyway.
+
+    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"
+
+    ;; To allow the Teleport and Show on Map buttons to work properly (for search
+    ;; results containing locations).  From ossearch module.
+;    LandServices = "RemoteLandServicesConnector"
+;    LandServiceInConnector = "true"
+
+[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 = "${Const|GridURL}:${Const|PrivatePort}"
+
+    ConnectionString = "${Const|ConnectionString}"
+
+
+[InventoryService]
+    ;
+    ; Change this to your grid-wide inventory server
+    ;
+    InventoryServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+    ConnectionString = "${Const|ConnectionString}"
+
+[GridInfo]
+    ;
+    ; Change this to your grid info service
+    ;
+    GridInfoURI = "${Const|GridURL}:${Const|PublicPort}"
+
+[GridService]
+    ;
+    ; Change this to your grid-wide grid server
+    ;
+    GridServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+    AllowHypergridMapSearch = true
+
+    ;; Directory for map tile images of linked regions
+    MapTileDirectory = "${Const|CachePath}/maptiles"
+
+    ; === HG ONLY ===
+    ;; Change this to the address of your Gatekeeper service
+    ;; (usually bundled with the rest of the services in one 
+    ;; Robust server in port ${Const|PublicPort}, but not always)
+    Gatekeeper="${Const|GridURL}:${Const|PublicPort}"
+
+[EstateDataStore]
+    ;
+    ; Uncomment if you want centralized estate data at robust server,
+    ; in which case the URL in [EstateService] will be used
+    ;
+    ;LocalServiceModule = "OpenSim.Services.Connectors.dll:EstateDataRemoteConnector"
+
+[EstateService]
+    EstateServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+[Messaging]
+    ; === HG ONLY ===
+    ;; Change this to the address of your Gatekeeper service
+    ;; (usually bundled with the rest of the services in one 
+    ;; Robust server in port ${Const|PublicPort}, but not always)
+    Gatekeeper = "${Const|GridURL}:${Const|PublicPort}"
+
+[AvatarService]
+    ;
+    ; Change this to your grid-wide grid server
+    ;
+    AvatarServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+    ConnectionString = "${Const|ConnectionString}"
+
+[AgentPreferencesService]
+    ;
+    ; Change this to your grid-wide avatar prefs server
+    ;
+    AgentPreferencesServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+[PresenceService]
+    ;
+    ; Change this to your grid-wide presence server
+    ;
+    PresenceServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+[UserAccountService]
+    ;
+    ; Change this to your grid-wide user accounts server
+    ;
+    UserAccountServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+    ConnectionString = "${Const|ConnectionString}"
+
+[GridUserService]
+    ;
+    ; Change this to your grid-wide user accounts server
+    ;
+    GridUserServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+    ConnectionString = "${Const|ConnectionString}"
+
+[AuthenticationService]
+    ;
+    ; Change this to your grid-wide authentication server
+    ;
+    AuthenticationServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+    ConnectionString = "${Const|ConnectionString}"
+
+[FriendsService]
+    ;
+    ; Change this to your grid-wide friends server
+    ;
+    FriendsServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+    ConnectionString = "${Const|ConnectionString}"
+
+[HGInventoryAccessModule]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your server 
+    ; accessible from other grids
+    ;
+    HomeURI = "${Const|GridURL}:${Const|PublicPort}"
+    Gatekeeper = "${Const|GridURL}:${Const|PublicPort}"
+    ;; If you want to protect your assets from being copied by foreign visitors
+    ;; set this to false. You may want to do this on sims that have licensed content.
+    ;; Default is true.
+    OutboundPermission = True
+
+    ;; Send visual reminder to local users that their inventories are unavailable while they are traveling
+    ;; and available when they return. True by default.
+    ;RestrictInventoryAccessAbroad = True
+
+    ;; Warning: advanced and unusual. Default is false.
+    ;; Enables configurations where grids share user services, including inventory,
+    ;; while separating regions' assets from users' assets. Asset transfer between 
+    ;; the users' asset server and the regions' asset server is done in HG-like manner.
+    ; CheckSeparateAssets = false
+    ; RegionHGAssetServerURI = ${Const|GridURL}:${Const|PublicPort}
+
+
+[HGAssetService]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your server 
+    ; accessible from other grids
+    ;
+    HomeURI = "${Const|GridURL}:${Const|PublicPort}"
+
+    ;; The asset types that this grid can export to / import from other grids.
+    ;; Comma separated.
+    ;; Valid values are all the asset types in OpenMetaverse.AssetType, namely:
+    ;; Unknown, Texture, Sound, CallingCard, Landmark, Clothing, Object, Notecard, LSLText, 
+    ;; LSLBytecode, TextureTGA, Bodypart, SoundWAV, ImageTGA, ImageJPEG, Animation, Gesture, Mesh 
+    ;;
+    ;; Leave blank or commented if you don't want to apply any restrictions.
+    ;; A more strict, but still reasonable, policy may be to disallow the exchange 
+    ;; of scripts, like so:
+    ; DisallowExport ="LSLText"
+    ; DisallowImport ="LSLBytecode"
+
+[HGFriendsModule]
+    ; User level required to be able to send friendship invitations to foreign users
+    LevelHGFriends = 0;
+
+[UserAgentService]
+    ;
+    ; === HG ONLY ===
+    ; Change this to your user agent server (HG robust)
+    ;
+    UserAgentServerURI = "${Const|GridURL}:${Const|PublicPort}"
+
+[MapImageService]
+    MapImageServerURI = "${Const|GridURL}:${Const|PrivatePort}"
+
+[AuthorizationService]
+  ; If you have regions with access restrictions
+    ; specify them here using the convention
+    ; Region_<Region_Name> = <flags>
+    ; Valid flags are:
+    ; DisallowForeigners -- HG visitors not allowed
+    ; DisallowResidents -- only Admins and Managers allowed
+    ; Example:
+    ; Region_Test_1 = "DisallowForeigners"
+
+;; Uncomment if you are using SimianGrid for grid services
+[SimianGrid]
+    ;; SimianGrid services URL
+    ;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
+
+    ;; Capability assigned by the grid administrator for the simulator
+    ;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"
+