From ab54ce1907e26935bfb847742d4f5aa95d34aca0 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Mon, 19 Mar 2012 00:18:04 +0000 Subject: Fix configuration problems where XAssetDatabasePlugin was picked up accidentally. The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up. This replaces the changes in 92b1ade. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files. This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places). Unfortunately, you will need to rollback to an earlier database backup or reupload the textures. --- bin/Robust.HG.ini.example | 1 - bin/Robust.ini.example | 1 - bin/config-include/StandaloneCommon.ini.example | 3 +-- 3 files changed, 1 insertion(+), 4 deletions(-) (limited to 'bin') 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" -- cgit v1.1 From 4972491efb0d83e0963445bfbeeaeee41b5e38e6 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Mon, 19 Mar 2012 00:29:02 +0000 Subject: Move startup/shutdown command .txt files to .txt.example files to avoid clobbering on updates. Thanks to Whitestar in http://opensimulator.org/mantis/view.php?id=5938 for pointing out this problem. --- bin/shutdown_commands.txt | 3 --- bin/shutdown_commands.txt.example | 3 +++ bin/startup_commands.txt | 3 --- bin/startup_commands.txt.example | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 bin/shutdown_commands.txt create mode 100644 bin/shutdown_commands.txt.example delete mode 100644 bin/startup_commands.txt create mode 100644 bin/startup_commands.txt.example (limited to 'bin') 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. -- cgit v1.1