aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs18
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 18 insertions, 2 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index b3687de..16a05af 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -719,7 +719,23 @@ namespace OpenSim.Data.SQLite
719 terrainDa.Update(ds, "terrain"); 719 terrainDa.Update(ds, "terrain");
720 landDa.Update(ds, "land"); 720 landDa.Update(ds, "land");
721 landAccessListDa.Update(ds, "landaccesslist"); 721 landAccessListDa.Update(ds, "landaccesslist");
722 regionSettingsDa.Update(ds, "regionsettings"); 722 try
723 {
724 regionSettingsDa.Update(ds, "regionsettings");
725 }
726 catch (SqliteExecutionException SqlEx)
727 {
728 if (SqlEx.Message.Contains("logic error"))
729 {
730 throw new Exception(
731 "There was a SQL error or connection string configuration error when saving the region settings. This could be a bug, it could also happen if ConnectionString is defined in the [DatabaseService] section of StandaloneCommon.ini in the config_include folder. This could also happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set. If this is your first time running OpenSimulator, please restart the simulator and bug a developer to fix this!",
732 SqlEx);
733 }
734 else
735 {
736 throw SqlEx;
737 }
738 }
723 ds.AcceptChanges(); 739 ds.AcceptChanges();
724 } 740 }
725 } 741 }
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c9fd6b5..92cea43 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.Framework.Scenes
158 158
159 if (m_InventoryService == null) 159 if (m_InventoryService == null)
160 { 160 {
161 throw new Exception("No IInventoryService available."); 161 throw new Exception("No IInventoryService available. This could happen if the config_include folder doesn't exist or if the OpenSim.ini [Architecture] section isn't set. Please also check that you have the correct version of your inventory service dll. Sometimes old versions of this dll will still exist. Do a clean checkout and re-create the opensim.ini from the opensim.ini.example.");
162 } 162 }
163 } 163 }
164 164