diff options
author | BlueWall | 2015-03-04 19:27:34 -0500 |
---|---|---|
committer | BlueWall | 2015-03-04 19:27:34 -0500 |
commit | d7b45a3ed20e6d4230faa812616a6031001c8977 (patch) | |
tree | 775f5010c2010e30990f9a0d01280adc44373081 /OpenSim | |
parent | Revert "removed replacement texture in UDP Texture code. The replacement text... (diff) | |
download | opensim-SC_OLD-d7b45a3ed20e6d4230faa812616a6031001c8977.zip opensim-SC_OLD-d7b45a3ed20e6d4230faa812616a6031001c8977.tar.gz opensim-SC_OLD-d7b45a3ed20e6d4230faa812616a6031001c8977.tar.bz2 opensim-SC_OLD-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.migrations | 3 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/Resources/XAssetStore.migrations | 3 | ||||
-rw-r--r-- | OpenSim/Data/PGSQL/Resources/AssetStore.migrations | 3 | ||||
-rw-r--r-- | OpenSim/Data/PGSQL/Resources/XAssetStore.migrations | 3 | ||||
-rw-r--r-- | OpenSim/Framework/AssetBase.cs | 2 |
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 | ||
80 | ALTER TABLE assets MODIFY description varchar(128); | 80 | BEGIN; |
81 | 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; | |||
29 | :VERSION 2 | 29 | :VERSION 2 |
30 | 30 | ||
31 | BEGIN; | 31 | BEGIN; |
32 | |||
33 | ALTER TABLE xassetsmeta MODIFY Description varchar(128); | ||
34 | |||
35 | COMMIT; | 32 | 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 ''; | |||
95 | 95 | ||
96 | :VERSION 8 | 96 | :VERSION 8 |
97 | 97 | ||
98 | ALTER TABLE assets ALTER COLUMN description TYPE varchar(128); | 98 | BEGIN TRANSACTION; |
99 | 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; | |||
77 | :VERSION 5 | 77 | :VERSION 5 |
78 | 78 | ||
79 | BEGIN; | 79 | BEGIN; |
80 | |||
81 | ALTER TABLE xassetsmeta ALTER COLUMN description TYPE varchar(128); | ||
82 | |||
83 | COMMIT; | 80 | 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 | |||
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 |