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

inv-download
BlueWall 2015-03-04 19:40:31 -05:00
commit 7adeb43a88
5 changed files with 5 additions and 9 deletions

View File

@ -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;

View File

@ -29,7 +29,4 @@ COMMIT;
:VERSION 2
BEGIN;
ALTER TABLE xassetsmeta MODIFY Description varchar(128);
COMMIT;

View File

@ -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;

View File

@ -77,7 +77,4 @@ COMMIT;
:VERSION 5
BEGIN;
ALTER TABLE xassetsmeta ALTER COLUMN description TYPE varchar(128);
COMMIT;

View File

@ -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