Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/MySQL/MySQLXAssetData.cs

7 files changed, 7 insertions, 10 deletions

diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index d98c826..db9f08b 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -66,7 +66,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 ; * in turn, reads the asset loader and database connection information
 ; *
 [AssetService]
-    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 691bfdc..326caeb 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -58,7 +58,6 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
 ; * in turn, reads the asset loader and database connection information
 ; *
 [AssetService]
-    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "./assets/AssetSets.xml"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 4c734a1..3dfbed7 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -44,7 +44,6 @@
     ;AuthorizationServices = "LocalAuthorizationServicesConnector"
 
 [AssetService]
-    StorageProvider = "OpenSim.Data.MySQL.dll:MySQLAssetData"
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
 
@@ -241,4 +240,4 @@
         ; DisallowForeigners -- HG visitors not allowed
         ; DisallowResidents -- only Admins and Managers allowed
         ; Example:
-        ; Region_Test_1 = "DisallowForeigners"
\ No newline at end of file
+        ; Region_Test_1 = "DisallowForeigners"
diff --git a/bin/shutdown_commands.txt b/bin/shutdown_commands.txt
deleted file mode 100644
index 4397749..0000000
--- a/bin/shutdown_commands.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-; You can place simulator console commands here to execute when the simulator is shut down
-; e.g. show stats
-; Lines starting with ; are comments
diff --git a/bin/shutdown_commands.txt.example b/bin/shutdown_commands.txt.example
new file mode 100644
index 0000000..dc07dc9
--- /dev/null
+++ b/bin/shutdown_commands.txt.example
@@ -0,0 +1,3 @@
+; Copy this file to shutdown_commands.txt to execute region console commands when the simulator is asked to shut down
+; e.g. show stats
+; Lines that start with ; are comments
diff --git a/bin/startup_commands.txt b/bin/startup_commands.txt
deleted file mode 100644
index 1abfa64..0000000
--- a/bin/startup_commands.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-; You can place region console commands here to execute once the simulator has finished starting up 
-; e.g. show stats
-; Lines start with ; are comments.
diff --git a/bin/startup_commands.txt.example b/bin/startup_commands.txt.example
new file mode 100644
index 0000000..677109c
--- /dev/null
+++ b/bin/startup_commands.txt.example
@@ -0,0 +1,3 @@
+; Copy this file to startup_commands.txt to run region console commands once the simulator has finished starting up
+; e.g. show stats
+; Lines that start with ; are comments.