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

4 files changed, 41 insertions, 11 deletions

diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index c7488d8..f3e008d 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -163,14 +163,18 @@ namespace OpenSim.Data.MSSQL
             if (asset.Name.Length > 64)
             {
                 assetName = asset.Name.Substring(0, 64);
-                m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
+                m_log.WarnFormat(
+                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Name, asset.ID, asset.Name.Length, assetName.Length);
             }
             
             string assetDescription = asset.Description;
             if (asset.Description.Length > 64)
             {
                 assetDescription = asset.Description.Substring(0, 64);
-                m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
+                m_log.WarnFormat(
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
             }
             
             using (SqlConnection conn = new SqlConnection(m_connectionString))
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 73de64b..cf80b3d 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -173,14 +173,18 @@ namespace OpenSim.Data.MySQL
                         if (asset.Name.Length > 64)
                         {
                             assetName = asset.Name.Substring(0, 64);
-                            m_log.Warn("[ASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
+                            m_log.WarnFormat(
+                                "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                asset.Name, asset.ID, asset.Name.Length, assetName.Length);
                         }
     
                         string assetDescription = asset.Description;
                         if (asset.Description.Length > 64)
                         {
                             assetDescription = asset.Description.Substring(0, 64);
-                            m_log.Warn("[ASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
+                            m_log.WarnFormat(
+                                "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
                         }
     
                         try
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index e6ac22e..c2282c8 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -204,14 +204,18 @@ namespace OpenSim.Data.MySQL
                         if (asset.Name.Length > 64)
                         {
                             assetName = asset.Name.Substring(0, 64);
-                            m_log.Warn("[XASSET DB]: Name field truncated from " + asset.Name.Length + " to " + assetName.Length + " characters on add");
+                            m_log.WarnFormat(
+                                "[XASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                asset.Name, asset.ID, asset.Name.Length, assetName.Length);
                         }
     
                         string assetDescription = asset.Description;
                         if (asset.Description.Length > 64)
                         {
                             assetDescription = asset.Description.Substring(0, 64);
-                            m_log.Warn("[XASSET DB]: Description field truncated from " + asset.Description.Length + " to " + assetDescription.Length + " characters on add");
+                            m_log.WarnFormat(
+                                "[XASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                                asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
                         }
 
                         if (m_enableCompression)
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 61e7aaf..c32982e 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Data.SQLite
     /// </summary>
     public class SQLiteAssetData : AssetDataBase
     {
-//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private const string SelectAssetSQL = "select * from assets where UUID=:UUID";
         private const string SelectAssetMetadataSQL = "select Name, Description, Type, Temporary, asset_flags, UUID, CreatorID from assets limit :start, :count";
@@ -133,6 +133,24 @@ namespace OpenSim.Data.SQLite
         /// <param name="asset">Asset Base</param>
         override public void StoreAsset(AssetBase asset)
         {
+            string assetName = asset.Name;
+            if (asset.Name.Length > 64)
+            {
+                assetName = asset.Name.Substring(0, 64);
+                m_log.WarnFormat(
+                    "[ASSET DB]: Name '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Name, asset.ID, asset.Name.Length, assetName.Length);
+            }
+
+            string assetDescription = asset.Description;
+            if (asset.Description.Length > 64)
+            {
+                assetDescription = asset.Description.Substring(0, 64);
+                m_log.WarnFormat(
+                    "[ASSET DB]: Description '{0}' for asset {1} truncated from {2} to {3} characters on add", 
+                    asset.Description, asset.ID, asset.Description.Length, assetDescription.Length);
+            }
+
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
             {
@@ -143,8 +161,8 @@ namespace OpenSim.Data.SQLite
                     using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
                     {
                         cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
-                        cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
-                        cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
+                        cmd.Parameters.Add(new SqliteParameter(":Name", assetName));
+                        cmd.Parameters.Add(new SqliteParameter(":Description", assetDescription));
                         cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
                         cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
                         cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
@@ -163,8 +181,8 @@ namespace OpenSim.Data.SQLite
                     using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
                     {
                         cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
-                        cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
-                        cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
+                        cmd.Parameters.Add(new SqliteParameter(":Name", assetName));
+                        cmd.Parameters.Add(new SqliteParameter(":Description", assetDescription));
                         cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
                         cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
                         cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));