aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJeff Ames2007-12-20 01:01:42 +0000
committerJeff Ames2007-12-20 01:01:42 +0000
commit36a8f70931e24ccdf027966b737d95736be6e3f9 (patch)
tree541d27bf497ea3f1b7f2a92241c5032e98880d05 /OpenSim
parent* Re-did the mass calculations in ODE for Prim (diff)
downloadopensim-SC-36a8f70931e24ccdf027966b737d95736be6e3f9.zip
opensim-SC-36a8f70931e24ccdf027966b737d95736be6e3f9.tar.gz
opensim-SC-36a8f70931e24ccdf027966b737d95736be6e3f9.tar.bz2
opensim-SC-36a8f70931e24ccdf027966b737d95736be6e3f9.tar.xz
Extended svn:eol-style to check some other file types.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql20
-rw-r--r--OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql22
-rw-r--r--OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql36
-rw-r--r--OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql8
-rw-r--r--OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql18
5 files changed, 52 insertions, 52 deletions
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql b/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql
index b9c1b97..2c750fe 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/CreateAssetsTable.sql
@@ -1,11 +1,11 @@
1CREATE TABLE `assets` ( 1CREATE TABLE `assets` (
2 `id` binary(16) NOT NULL, 2 `id` binary(16) NOT NULL,
3 `name` varchar(64) NOT NULL, 3 `name` varchar(64) NOT NULL,
4 `description` varchar(64) NOT NULL, 4 `description` varchar(64) NOT NULL,
5 `assetType` tinyint(4) NOT NULL, 5 `assetType` tinyint(4) NOT NULL,
6 `invType` tinyint(4) NOT NULL, 6 `invType` tinyint(4) NOT NULL,
7 `local` tinyint(1) NOT NULL, 7 `local` tinyint(1) NOT NULL,
8 `temporary` tinyint(1) NOT NULL, 8 `temporary` tinyint(1) NOT NULL,
9 `data` longblob NOT NULL, 9 `data` longblob NOT NULL,
10 PRIMARY KEY (`id`) 10 PRIMARY KEY (`id`)
11) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; \ No newline at end of file 11) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 1'; \ No newline at end of file
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql b/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql
index 2bb5553..b5bddde 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/CreateFoldersTable.sql
@@ -1,11 +1,11 @@
1CREATE TABLE `inventoryfolders` ( 1CREATE TABLE `inventoryfolders` (
2 `folderID` varchar(36) NOT NULL default '', 2 `folderID` varchar(36) NOT NULL default '',
3 `agentID` varchar(36) default NULL, 3 `agentID` varchar(36) default NULL,
4 `parentFolderID` varchar(36) default NULL, 4 `parentFolderID` varchar(36) default NULL,
5 `folderName` varchar(64) default NULL, 5 `folderName` varchar(64) default NULL,
6 `type` smallint NOT NULL default 0, 6 `type` smallint NOT NULL default 0,
7 `version` int NOT NULL default 0, 7 `version` int NOT NULL default 0,
8 PRIMARY KEY (`folderID`), 8 PRIMARY KEY (`folderID`),
9 KEY `owner` (`agentID`), 9 KEY `owner` (`agentID`),
10 KEY `parent` (`parentFolderID`) 10 KEY `parent` (`parentFolderID`)
11) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2'; 11) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2';
diff --git a/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql b/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql
index 8c79483..53d2db0 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/CreateItemsTable.sql
@@ -1,18 +1,18 @@
1CREATE TABLE `inventoryitems` ( 1CREATE TABLE `inventoryitems` (
2 `inventoryID` varchar(36) NOT NULL default '', 2 `inventoryID` varchar(36) NOT NULL default '',
3 `assetID` varchar(36) default NULL, 3 `assetID` varchar(36) default NULL,
4 `assetType` int(11) default NULL, 4 `assetType` int(11) default NULL,
5 `parentFolderID` varchar(36) default NULL, 5 `parentFolderID` varchar(36) default NULL,
6 `avatarID` varchar(36) default NULL, 6 `avatarID` varchar(36) default NULL,
7 `inventoryName` varchar(64) default NULL, 7 `inventoryName` varchar(64) default NULL,
8 `inventoryDescription` varchar(64) default NULL, 8 `inventoryDescription` varchar(64) default NULL,
9 `inventoryNextPermissions` int(10) unsigned default NULL, 9 `inventoryNextPermissions` int(10) unsigned default NULL,
10 `inventoryCurrentPermissions` int(10) unsigned default NULL, 10 `inventoryCurrentPermissions` int(10) unsigned default NULL,
11 `invType` int(11) default NULL, 11 `invType` int(11) default NULL,
12 `creatorID` varchar(36) default NULL, 12 `creatorID` varchar(36) default NULL,
13 `inventoryBasePermissions` int(10) unsigned NOT NULL default 0, 13 `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,
14 `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0, 14 `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,
15 PRIMARY KEY (`inventoryID`), 15 PRIMARY KEY (`inventoryID`),
16 KEY `owner` (`avatarID`), 16 KEY `owner` (`avatarID`),
17 KEY `folder` (`parentFolderID`) 17 KEY `folder` (`parentFolderID`)
18) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2'; 18) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Rev. 2';
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql b/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql
index 813c7c4..b5a7964 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/UpgradeFoldersTableToVersion2.sql
@@ -1,4 +1,4 @@
1ALTER TABLE `inventoryfolders` 1ALTER TABLE `inventoryfolders`
2 ADD COLUMN `type` smallint NOT NULL default 0, 2 ADD COLUMN `type` smallint NOT NULL default 0,
3 ADD COLUMN `version` int NOT NULL default 0, 3 ADD COLUMN `version` int NOT NULL default 0,
4COMMENT='Rev. 2'; 4COMMENT='Rev. 2';
diff --git a/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql b/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql
index c47786c..d1ef504 100644
--- a/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql
+++ b/OpenSim/Framework/Data.MySQL/Resources/UpgradeItemsTableToVersion2.sql
@@ -1,9 +1,9 @@
1ALTER TABLE `inventoryitems` 1ALTER TABLE `inventoryitems`
2 CHANGE COLUMN `type` `assetType` int(11) default NULL, 2 CHANGE COLUMN `type` `assetType` int(11) default NULL,
3 ADD COLUMN `invType` int(11) default NULL, 3 ADD COLUMN `invType` int(11) default NULL,
4 ADD COLUMN `creatorID` varchar(36) default NULL, 4 ADD COLUMN `creatorID` varchar(36) default NULL,
5 ADD COLUMN `inventoryBasePermissions` int(10) unsigned NOT NULL default 0, 5 ADD COLUMN `inventoryBasePermissions` int(10) unsigned NOT NULL default 0,
6 ADD COLUMN `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0, 6 ADD COLUMN `inventoryEveryOnePermissions` int(10) unsigned NOT NULL default 0,
7COMMENT='Rev. 2'; 7COMMENT='Rev. 2';
8 8
9UPDATE `inventoryitems` SET invType=assetType; 9UPDATE `inventoryitems` SET invType=assetType;