Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

@@ -656,7 +656,19 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                 if (m_Assemblies.ContainsKey(instance.AssetID))
                 {
                     string assembly = m_Assemblies[instance.AssetID];
-                    instance.SaveState(assembly);
+
+                    try
+                    {
+                        instance.SaveState(assembly);
+                    }
+                    catch (Exception e)
+                    {
+                        m_log.Error(
+                            string.Format(
+                                "[XEngine]: Failed final state save for script {0}.{1}, item UUID {2}, prim UUID {3} in {4}.  Exception ",
+                                instance.PrimName, instance.ScriptName, instance.ItemID, instance.ObjectID, World.Name)
+                            , e);
+                    }
                 }
 
                 // Clear the event queue and abort the instance thread
@@ -778,7 +790,18 @@ namespace OpenSim.Region.ScriptEngine.XEngine
                     assembly = m_Assemblies[i.AssetID];
                 
 
-                i.SaveState(assembly);
+                try
+                {
+                    i.SaveState(assembly);
+                }
+                catch (Exception e)
+                {
+                    m_log.Error(
+                        string.Format(
+                            "[XEngine]: Failed to save state of script {0}.{1}, item UUID {2}, prim UUID {3} in {4}.  Exception ",
+                            i.PrimName, i.ScriptName, i.ItemID, i.ObjectID, World.Name)
+                        , e);
+                }
             }
 
             instances.Clear();

bin/config-include/storage/SQLiteStandalone.ini

@@ -7,6 +7,16 @@
 [AssetService]
     ConnectionString = "URI=file: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.
+; However, the internal asset service will still use the [AssetService] section.
+; Therefore, you will almost certainly want the ConnectionString in [HGAssetService] to be the same as in [AssetService] 
+; so that they both access the same database.
+; 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"
+
 [InventoryService]
     ;ConnectionString = "URI=file:inventory.db,version=3"
     ; if you have a legacy inventory store use the connection string below