aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorBlueWall2015-03-04 19:27:34 -0500
committerBlueWall2015-03-04 19:27:34 -0500
commitd7b45a3ed20e6d4230faa812616a6031001c8977 (patch)
tree775f5010c2010e30990f9a0d01280adc44373081 /OpenSim
parentRevert "removed replacement texture in UDP Texture code. The replacement text... (diff)
downloadopensim-SC-d7b45a3ed20e6d4230faa812616a6031001c8977.zip
opensim-SC-d7b45a3ed20e6d4230faa812616a6031001c8977.tar.gz
opensim-SC-d7b45a3ed20e6d4230faa812616a6031001c8977.tar.bz2
opensim-SC-d7b45a3ed20e6d4230faa812616a6031001c8977.tar.xz
Alter the migrations so that it is a no-op as the columns are unused and the operation is very expensive
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MySQL/Resources/AssetStore.migrations3
-rw-r--r--OpenSim/Data/MySQL/Resources/XAssetStore.migrations3
-rw-r--r--OpenSim/Data/PGSQL/Resources/AssetStore.migrations3
-rw-r--r--OpenSim/Data/PGSQL/Resources/XAssetStore.migrations3
-rw-r--r--OpenSim/Framework/AssetBase.cs2
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 '';
77 77
78:VERSION 9 78:VERSION 9
79 79
80ALTER TABLE assets MODIFY description varchar(128); 80BEGIN;
81COMMIT;
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;
29:VERSION 2 29:VERSION 2
30 30
31BEGIN; 31BEGIN;
32
33ALTER TABLE xassetsmeta MODIFY Description varchar(128);
34
35COMMIT; 32COMMIT;
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 '';
95 95
96:VERSION 8 96:VERSION 8
97 97
98ALTER TABLE assets ALTER COLUMN description TYPE varchar(128); 98BEGIN TRANSACTION;
99COMMIT;
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;
77:VERSION 5 77:VERSION 5
78 78
79BEGIN; 79BEGIN;
80
81ALTER TABLE xassetsmeta ALTER COLUMN description TYPE varchar(128);
82
83COMMIT; 80COMMIT;
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
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 public static readonly int MAX_ASSET_NAME = 64; 53 public static readonly int MAX_ASSET_NAME = 64;
54 public static readonly int MAX_ASSET_DESC = 128; 54 public static readonly int MAX_ASSET_DESC = 64;
55 55
56 /// <summary> 56 /// <summary>
57 /// Data of the Asset 57 /// Data of the Asset