Merge branch 'master' of /team/src/opensim

5 files changed, 5 insertions, 9 deletions

diff --git a/OpenSim/Data/MySQL/Resources/AssetStore.migrations b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
index 2c5e7c3..661d825 100644
--- a/OpenSim/Data/MySQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/AssetStore.migrations
@@ -77,4 +77,5 @@ ALTER TABLE assets ADD COLUMN CreatorID varchar(128) NOT NULL DEFAULT '';
 
 :VERSION 9
 
-ALTER TABLE assets MODIFY description varchar(128);
+BEGIN;
+COMMIT;
diff --git a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
index d56c917..9459e3e 100644
--- a/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/XAssetStore.migrations
@@ -29,7 +29,4 @@ COMMIT;
 :VERSION 2
 
 BEGIN;
- 
-ALTER TABLE xassetsmeta MODIFY Description varchar(128);
-
 COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
index fb7d156..7a858b4 100644
--- a/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/AssetStore.migrations
@@ -95,4 +95,5 @@ alter table assets add "creatorid" varchar(36) not null default '';
 
 :VERSION 8
 
-ALTER TABLE assets ALTER COLUMN description TYPE varchar(128);
+BEGIN TRANSACTION;
+COMMIT;
diff --git a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
index 0e22091..df9d821 100644
--- a/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
+++ b/OpenSim/Data/PGSQL/Resources/XAssetStore.migrations
@@ -77,7 +77,4 @@ COMMIT;
 :VERSION 5
 
 BEGIN;
-
-ALTER TABLE xassetsmeta ALTER COLUMN description TYPE varchar(128);
-
 COMMIT;
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index 0c1fdda..153a1d0 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Framework
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public static readonly int MAX_ASSET_NAME = 64;
-        public static readonly int MAX_ASSET_DESC = 128;
+        public static readonly int MAX_ASSET_DESC = 64;
 
         /// <summary>
         /// Data of the Asset