22 files changed, 30 insertions, 330 deletions

diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index 5b7807a..db08aeb 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -25,14 +25,14 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/OpenSim.32BitLaunch.log" />
+      <file value="../logs/OpenSim.32BitLaunch.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
 -->
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.32BitLaunch.log" />
+      <file value="../logs/OpenSim.32BitLaunch.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
@@ -44,7 +44,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimStats.log"/>
+      <file value="../logs/OpenSimStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/OpenSim.ConsoleClient.exe.config b/bin/OpenSim.ConsoleClient.exe.config
index 3a50408..9098a94 100644
--- a/bin/OpenSim.ConsoleClient.exe.config
+++ b/bin/OpenSim.ConsoleClient.exe.config
@@ -18,7 +18,7 @@
     </appender>
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.ConsoleClient.log" />
+      <file value="../logs/OpenSim.ConsoleClient.log" />
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index b01191e..2556e11 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -25,14 +25,14 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/OpenSim.log" />
+      <file value="../logs/OpenSim.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
 -->
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.log" />
+      <file value="../logs/OpenSim.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
@@ -44,7 +44,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSimStats.log"/>
+      <file value="../logs/OpenSimStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index d395efe..07ed21d 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -901,7 +901,7 @@
     ;; co-op will be more stable but this option is currently experimental.
     ;; If moving from co-op to abort, existing script DLLs will need to be recompiled.
     ;; This currently can only be done manually, either by setting DeleteScriptsOnStartup = true for one run  
-    ;; or by deleting the script DLL* files in bin/ScriptEngines/<region-id>/
+    ;; or by deleting the script DLL* files in caches/ScriptEngines/<region-id>/
     ;; One can move from co-op back to abort without recompilation, but reverting back to co-op again will need script recompile
     ;; Current valid values are "abort" and "co-op"
     ; ScriptStopStrategy = abort
@@ -966,7 +966,7 @@
 
     ;# {ScriptEnginesPath} {} {Path to script assemblies} {} ScriptEngines
     ;; Path to script engine assemblies
-    ;; Default is ./bin/ScriptEngines
+    ;; Default is ../caches/ScriptEngines
     ; ScriptEnginesPath = "ScriptEngines"
 
 [OSSL]
diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust.32BitLaunch.exe.config
index 0399a1b..8706574 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust.32BitLaunch.exe.config
@@ -23,14 +23,14 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/Robust.32BitLaunch.log" />
+      <file value="../logs/Robust.32BitLaunch.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
 -->
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="Robust.32BitLaunch.log" />
+      <file value=../logs/"Robust.32BitLaunch.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
@@ -42,7 +42,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="RobustStats.log"/>
+      <file value="../logs/RobustStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/Robust.Tests.dll.config b/bin/Robust.Tests.dll.config
index a4c43e7..dc62ae0 100644
--- a/bin/Robust.Tests.dll.config
+++ b/bin/Robust.Tests.dll.config
@@ -22,7 +22,7 @@
     </appender>
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="Robust.Tests.log" />
+      <file value="../logs/Robust.Tests.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
diff --git a/bin/Robust.exe.config b/bin/Robust.exe.config
index 7db6458..196602e 100644
--- a/bin/Robust.exe.config
+++ b/bin/Robust.exe.config
@@ -23,14 +23,14 @@
 
 <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="log/Robust.log" />
+      <file value="../logs/Robust.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
 -->
 
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="Robust.log" />
+      <file value="../logs/Robust.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
@@ -42,7 +42,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="RobustStats.log"/>
+      <file value="../logs/RobustStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/config-include/GridCommon.ini b/bin/config-include/GridCommon.ini
deleted file mode 100644
index 58d921a..0000000
--- a/bin/config-include/GridCommon.ini
+++ /dev/null
@@ -1,300 +0,0 @@
-; 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
-    ;
-    ; NOTE - both are commented out, you'l have to choose one yourself.
-    ;
-
-    ; 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=***;"
-
-[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"
-
-    ;; 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 = "http://grid.infinitegrid.org:8003"
-
-[InventoryService]
-    ;
-    ; Change this to your grid-wide inventory server
-    ;
-    InventoryServerURI = "http://grid.infinitegrid.org:8003"
-
-[GridInfo]
-   ;
-   ; Change this to your grid info service
-   ;
-   GridInfoURI = "http://grid.infinitegrid.org:8002"
-
-[GridService]
-    ;
-    ; Change this to your grid-wide grid server
-    ;
-    GridServerURI = "http://grid.infinitegrid.org:8003"
-    AllowHypergridMapSearch = true
-
-    ;; Directory for map tile images of linked regions
-    ; MapTileDirectory = "./maptiles"
-    MapTileDirectory = "caches/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 8002, but not always)
-    Gatekeeper="http://grid.infinitegrid.org:8002"
-
-[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 8002, but not always)
-    Gatekeeper = "http://grid.infinitegrid.org:8002"
-
-[AvatarService]
-    ;
-    ; Change this to your grid-wide grid server
-    ;
-    AvatarServerURI = "http://grid.infinitegrid.org:8003"
-
-[PresenceService]
-    ;
-    ; Change this to your grid-wide presence server
-    ;
-    PresenceServerURI = "http://grid.infinitegrid.org:8003"
-
-[UserAccountService]
-    ;
-    ; Change this to your grid-wide user accounts server
-    ;
-    UserAccountServerURI = "http://grid.infinitegrid.org:8003"
-
-[GridUserService]
-    ;
-    ; Change this to your grid-wide user accounts server
-    ;
-    GridUserServerURI = "http://grid.infinitegrid.org:8003"
-
-[AuthenticationService]
-    ;
-    ; Change this to your grid-wide authentication server
-    ;
-    AuthenticationServerURI = "http://grid.infinitegrid.org:8003"
-
-[FriendsService]
-    ;
-    ; Change this to your grid-wide friends server
-    ;
-    FriendsServerURI = "http://grid.infinitegrid.org:8003"
-
-[HGInventoryAccessModule]
-    ;
-    ; === HG ONLY ===
-    ; Change this to your server 
-    ; accessible from other grids
-    ;
-    HomeURI = "http://grid.infinitegrid.org:8002"
-    Gatekeeper = "http://grid.infinitegrid.org:8002"
-    ;; If you want to protect your assets from being copied by foreign visitors
-    ;; uncomment the next line. You may want to do this on sims that have licensed content.
-    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
-
-
-[HGAssetService]
-    ;
-    ; === HG ONLY ===
-    ; Change this to your server 
-    ; accessible from other grids
-    ;
-    HomeURI = "http://grid.infinitegrid.org:8002"
-
-    ;; 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 = "http://grid.infinitegrid.org:8002"
-
-[MapImageService]
-        MapImageServerURI = "http://grid.infinitegrid.org:8003"
-
-[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"
-
-
-;; From the original IG version -
-[Profile]
-    ProfileURL = http://www.infinitegrid.org/opensim/profile.php
-
-
-[Search]
-    SearchURL = http://www.infinitegrid.org/opensim/query.php
-
-
-[DataSnapshot]
-    ;# {gridname} {index_sims:true} {Enter the name fo your grid} {} OSGrid
-    ;; If search is on, change this to your grid name; will be ignored for
-    ;; standalones
-    gridname = "InfiniteGrid"
-
-    ;# {data_services} {index_sims:true} {Data service URLs to register with?} {} http://metaverseink.com/cgi-bin/register.py
-    ; This semicolon-separated string serves to notify specific data services
-    ; about the existence of this sim. Uncomment if you want to index your
-    ; data with this and/or other search providers.
-    data_services="http://www.infinitegrid.org/opensim/register.php"
-
-
-[Messaging]
-;; From the original IG version -
-    InstantMessageModule = InstantMessageModule
-;    MessageTransferModule = MessageTransferModule
-;    MuteListModule = NSLMuteListModule
-
-    ;# {OfflineMessageModule} {} {Module to use for offline message storage} {OfflineMessageModule *}
-    ;; Module to handle offline messaging. The core module requires an external
-    ;; web service to do this. See OpenSim wiki.
-    OfflineMessageModule = OfflineMessageModule
-
-    ;# {OfflineMessageURL} {OfflineMessageModule:OfflineMessageModule} {URL of offline messaging service} {}
-    ;; URL of web service for offline message storage
-    OfflineMessageURL = http://www.infinitegrid.org/opensim/offline.php
-
-    ;# {MuteListModule} {OfflineMessageModule:OfflineMessageModule} {} {} MuteListModule
-    ;; Mute list handler (not yet implemented). MUST BE SET to allow offline
-    ;; messages to work
-    MuteListModule = MuteListModule
-
-    ;# {MuteListURL} {OfflineMessageModule:OfflineMessageModule} {} {} http://yourserver/Mute.php
-    ;; URL of the web service that serves mute lists. Not currently used, but
-    ;; must be set to allow offline messaging to work.
-    MuteListURL = http://www.infinitegrid.org/opensim/mute.php
-
-    ;; Control whether group messages are forwarded to offline users.
-    ;; Default is true.
-    ;; This applies to the core groups module (Flotsam) only.
-    ForwardOfflineGroupMessages = false
-
-
-[Groups]
-    ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {} Default
-    ;; This is the current groups stub in Region.CoreModules.Avatar.Groups.
-    ;; All the other settings below only really apply to the Flotsam/SimianGrid
-    ;; GroupsModule.
-    ;; This module can use a PHP XmlRpc server from the Flotsam project at
-    ;; http://code.google.com/p/flotsam/
-    ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
-    ; Module = Default
-    Module = GroupsModule
-
-    ;# {MessagingEnabled} {Module:GroupsModule} {Is groups messaging enabled?} {true false} true
-    MessagingEnabled = true
-
-    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule} GroupsMessagingModule
-    MessagingModule = GroupsMessagingModule
-
-    ; Experimental option to only message cached online users rather than all users
-    ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
-    ; This currently only applies to the Flotsam XmlRpc backend
-    MessageOnlineUsersOnly = true
-
-    ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
-    ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one depending on
-    ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
-    ServicesConnectorModule = XmlRpcGroupsServicesConnector
-
-    ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {}
-    ;; URI for the groups services
-    ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
-    ;; or http://mygridserver.com:82/Grid/ for SimianGrid
-    GroupsServerURI = "http://www.infinitegrid.org/opensim/xmlrpc.php"
-
-    ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
-    ;; Enable Group Notices
-    NoticesEnabled = true
-
-    ;; This makes the Groups modules very chatty on the console.
-    DebugEnabled = false
-
-    ;; XmlRpc Security settings.  These must match those set on your backend
-    ;; groups service if the service is using these keys
-    XmlRpcServiceReadKey    = Uffmzl93xvrZK1w6KWeMg25pls8zWBr7hhibNDqzVy8qH4J
-    XmlRpcServiceWriteKey   = sgJfEs4nzRJ4GLlLGTRIqIYW6SPlUiu4MtauZkcmReuZaYh
-
-[Includes]
-
-    ;; This is an example, you'll need to provide your own.
-    Include-Common = config/database.ini
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config
index f017309..7ccc3ce 100755
--- a/bin/pCampBot.exe.config
+++ b/bin/pCampBot.exe.config
@@ -19,7 +19,7 @@
       </layout>
     </appender>
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="pCampBot.log" />
+      <file value="../logs/pCampBot.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
         <loggerToMatch value="special"/>
@@ -31,7 +31,7 @@
     </appender>
 
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="pCampBotStats.log"/>
+      <file value="../logs/pCampBotStats.log"/>
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
diff --git a/bin/OpenSimDefaults.ini b/config/OpenSimDefaults.ini
index a99608c..7ed31d4 100644
--- a/bin/OpenSimDefaults.ini
+++ b/config/OpenSimDefaults.ini
@@ -13,7 +13,7 @@
     ConsoleHistoryFileEnabled = true
 
     ; Log file location. This can be set to a simple file path
-    ; LogFile = OpenSim.log
+    ; LogFile = "../logs/OpenSim.log
 
     ; The history file can be just a filename (relative to OpenSim's bin/ directory
     ; or it can be a full path to somewhere else. (default is OpenSimConsoleHistory.txt in bin/)
diff --git a/bin/config-include/CenomeCache.ini.example b/config/config-include/CenomeCache.ini.example
index 4340493..4340493 100644
--- a/bin/config-include/CenomeCache.ini.example
+++ b/config/config-include/CenomeCache.ini.example
diff --git a/bin/config-include/FlotsamCache.ini.example b/config/config-include/FlotsamCache.ini.example
index ad74fc1..c166523 100644
--- a/bin/config-include/FlotsamCache.ini.example
+++ b/config/config-include/FlotsamCache.ini.example
@@ -4,7 +4,7 @@
     ;;
 
     ; cache directory can be shared by multiple instances
-    CacheDirectory = ./assetcache
+    CacheDirectory = ../caches/assetcache
     ; Other examples:
     ;CacheDirectory = /directory/writable/by/OpenSim/instance
 
diff --git a/bin/config-include/Grid.ini b/config/config-include/Grid.ini
index 3c61ee0..3c61ee0 100644
--- a/bin/config-include/Grid.ini
+++ b/config/config-include/Grid.ini
diff --git a/bin/config-include/GridCommon.ini.example b/config/config-include/GridCommon.ini.example
index 0922cf5..0922cf5 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/config/config-include/GridCommon.ini.example
diff --git a/bin/config-include/GridHypergrid.ini b/config/config-include/GridHypergrid.ini
index 602d673..602d673 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/config/config-include/GridHypergrid.ini
diff --git a/bin/config-include/HyperSimianGrid.ini b/config/config-include/HyperSimianGrid.ini
index efad577..efad577 100644
--- a/bin/config-include/HyperSimianGrid.ini
+++ b/config/config-include/HyperSimianGrid.ini
diff --git a/bin/config-include/SimianGrid.ini b/config/config-include/SimianGrid.ini
index 5749656..5749656 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/config/config-include/SimianGrid.ini
diff --git a/bin/config-include/Standalone.ini b/config/config-include/Standalone.ini
index 78ada2b..78ada2b 100644
--- a/bin/config-include/Standalone.ini
+++ b/config/config-include/Standalone.ini
diff --git a/bin/config-include/StandaloneCommon.ini.example b/config/config-include/StandaloneCommon.ini.example
index d0b152c..d0b152c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/config/config-include/StandaloneCommon.ini.example
diff --git a/bin/config-include/StandaloneHypergrid.ini b/config/config-include/StandaloneHypergrid.ini
index eaacfff..eaacfff 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/config/config-include/StandaloneHypergrid.ini
diff --git a/bin/config-include/osslEnable.ini b/config/config-include/osslEnable.ini
index 0a03d4c..0a03d4c 100644
--- a/bin/config-include/osslEnable.ini
+++ b/config/config-include/osslEnable.ini
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/config/config-include/storage/SQLiteStandalone.ini
index 67d98ff..14051cc 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/config/config-include/storage/SQLiteStandalone.ini
@@ -2,10 +2,10 @@
 
 [DatabaseService]
     StorageProvider = "OpenSim.Data.SQLite.dll"
-    ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
+    ConnectionString = "URI=file:../db/OpenSim.db,version=3,UseUTF16Encoding=True"
 
 [AssetService]
-    ConnectionString = "URI=file:Asset.db,version=3"
+    ConnectionString = "URI=file:../db/Asset.db,version=3"
 
 ; The HGAssetService section controls the connection given to the AssetService in a Hypergrid configuration.
 ; This has to be separate from [AssetService] because the Hypergrid facing connector uses [HGAssetService] for its config data instead.
@@ -15,25 +15,25 @@
 ; This issue does not apply to normal MySQL/MSSQL configurations, since by default they use the settings in [DatabaseService] and
 ; do not have separate connection strings for different services.
 [HGAssetService]
-    ConnectionString = "URI=file:Asset.db,version=3"
+    ConnectionString = "URI=file:../db/Asset.db,version=3"
 
 [InventoryService]
-    ;ConnectionString = "URI=file:inventory.db,version=3"
+    ;ConnectionString = "URI=file:../db/inventory.db,version=3"
     ; if you have a legacy inventory store use the connection string below
-    ConnectionString = "URI=file:inventory.db,version=3,UseUTF16Encoding=True"
+    ConnectionString = "URI=file:../db/inventory.db,version=3,UseUTF16Encoding=True"
 
 [AvatarService]
-    ConnectionString = "URI=file:avatars.db,version=3"
+    ConnectionString = "URI=file:../db/avatars.db,version=3"
 
 [AuthenticationService]
-    ConnectionString = "URI=file:auth.db,version=3"
+    ConnectionString = "URI=file:../db/auth.db,version=3"
 
 [UserAccountService]
-    ConnectionString = "URI=file:userprofiles.db,version=3"
+    ConnectionString = "URI=file:../db/userprofiles.db,version=3"
 
 [GridUserService]
-    ConnectionString = "URI=file:griduser.db,version=3"
+    ConnectionString = "URI=file:../db/griduser.db,version=3"
 
 [FriendsService]
-    ConnectionString = "URI=file:friends.db,version=3"
+    ConnectionString = "URI=file:../db/friends.db,version=3"