Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

3 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 4aa19d1..8d85d1a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -651,8 +651,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             catch (Exception e)
             {
                 // Make sure that we see any exception caused by the asynchronous operation.
-                m_log.Error(
-                    string.Format("[LLCLIENTVIEW]: Caught exception while processing {0}", packetObject.Pack), e);
+                m_log.ErrorFormat(
+                    "[LLCLIENTVIEW]: Caught exception while processing {0} for {1}, {2} {3}", 
+                    packetObject.Pack, Name, e.Message, e.StackTrace);
             }
         }
 
diff --git a/bin/config-include/storage/SQLiteLegacyStandalone.ini b/bin/config-include/storage/SQLiteLegacyStandalone.ini
index facbbd6..ffe9a70 100644
--- a/bin/config-include/storage/SQLiteLegacyStandalone.ini
+++ b/bin/config-include/storage/SQLiteLegacyStandalone.ini
@@ -4,6 +4,9 @@
     StorageProvider = "OpenSim.Data.SQLiteLegacy.dll"
     ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
 
+[AssetService]
+    ConnectionString = "URI=file:Asset.db,version=3"
+
 [AvatarService]
     ConnectionString = "URI=file:avatars.db,version=3"
 
diff --git a/bin/config-include/storage/SQLiteStandalone.ini b/bin/config-include/storage/SQLiteStandalone.ini
index 10e6991..c1de71a 100644
--- a/bin/config-include/storage/SQLiteStandalone.ini
+++ b/bin/config-include/storage/SQLiteStandalone.ini
@@ -4,6 +4,9 @@
     StorageProvider = "OpenSim.Data.SQLite.dll"
     ConnectionString = "URI=file:OpenSim.db,version=3,UseUTF16Encoding=True"
 
+[AssetService]
+    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