diff options
author | idb | 2009-02-20 22:56:40 +0000 |
---|---|---|
committer | idb | 2009-02-20 22:56:40 +0000 |
commit | 6119b02860ccad928cacb071c4cd07cb99cddacf (patch) | |
tree | dc5e77cd8f74066a0b0539918c9d178dcd6570ec /OpenSim | |
parent | From: Arthur Rodrigo S Valadares <arthursv@br.ibm.com> (diff) | |
download | opensim-SC-6119b02860ccad928cacb071c4cd07cb99cddacf.zip opensim-SC-6119b02860ccad928cacb071c4cd07cb99cddacf.tar.gz opensim-SC-6119b02860ccad928cacb071c4cd07cb99cddacf.tar.bz2 opensim-SC-6119b02860ccad928cacb071c4cd07cb99cddacf.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=3185
* Fixes NHibernate problem where prim contents show as textures
* Thanks Tommil!
Diffstat (limited to '')
6 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql index f388f1a..181a74c 100644 --- a/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql | |||
@@ -90,6 +90,7 @@ create table PrimItems ( | |||
90 | Description NVARCHAR(255) null, | 90 | Description NVARCHAR(255) null, |
91 | CreationDate INT null, | 91 | CreationDate INT null, |
92 | Flags INT null, | 92 | Flags INT null, |
93 | Type INT null, | ||
93 | InvType INT null, | 94 | InvType INT null, |
94 | primary key (ItemID) | 95 | primary key (ItemID) |
95 | ) | 96 | ) |
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql index 74f67f2..eb1d8fe 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql | |||
@@ -100,6 +100,7 @@ CREATE TABLE PrimItems ( | |||
100 | LastOwnerID VARCHAR(36) DEFAULT NULL, | 100 | LastOwnerID VARCHAR(36) DEFAULT NULL, |
101 | CreatorID VARCHAR(36) DEFAULT NULL, | 101 | CreatorID VARCHAR(36) DEFAULT NULL, |
102 | CreationDate BIGINT DEFAULT NULL, | 102 | CreationDate BIGINT DEFAULT NULL, |
103 | Type INT DEFAULT NULL, | ||
103 | InvType INT DEFAULT NULL, | 104 | InvType INT DEFAULT NULL, |
104 | Name VARCHAR(255) DEFAULT NULL, | 105 | Name VARCHAR(255) DEFAULT NULL, |
105 | Description VARCHAR(255) DEFAULT NULL, | 106 | Description VARCHAR(255) DEFAULT NULL, |
diff --git a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql index 25c3945..f4a0e68 100644 --- a/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql | |||
@@ -100,6 +100,7 @@ CREATE TABLE PrimItems ( | |||
100 | LastOwnerID VARCHAR(36) DEFAULT NULL, | 100 | LastOwnerID VARCHAR(36) DEFAULT NULL, |
101 | CreatorID VARCHAR(36) DEFAULT NULL, | 101 | CreatorID VARCHAR(36) DEFAULT NULL, |
102 | CreationDate INT DEFAULT NULL, | 102 | CreationDate INT DEFAULT NULL, |
103 | Type INT DEFAULT NULL, | ||
103 | InvType INT DEFAULT NULL, | 104 | InvType INT DEFAULT NULL, |
104 | Name VARCHAR(255) DEFAULT NULL, | 105 | Name VARCHAR(255) DEFAULT NULL, |
105 | Description VARCHAR(255) DEFAULT NULL, | 106 | Description VARCHAR(255) DEFAULT NULL, |
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml index d41d1e7..98c648b 100644 --- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | |||
@@ -141,6 +141,7 @@ | |||
141 | <property name="CreationDate" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 141 | <property name="CreationDate" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
142 | <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 142 | <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
143 | <property name="InvType" type="System.Int32" /> | 143 | <property name="InvType" type="System.Int32" /> |
144 | <property name="Type" type="System.Int32" /> | ||
144 | </class> | 145 | </class> |
145 | 146 | ||
146 | </hibernate-mapping> | 147 | </hibernate-mapping> |
diff --git a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql index 1cf5e15..2b8e62a 100644 --- a/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql | |||
@@ -100,6 +100,7 @@ CREATE TABLE PrimItems ( | |||
100 | LastOwnerID VARCHAR(36) DEFAULT NULL, | 100 | LastOwnerID VARCHAR(36) DEFAULT NULL, |
101 | CreatorID VARCHAR(36) DEFAULT NULL, | 101 | CreatorID VARCHAR(36) DEFAULT NULL, |
102 | CreationDate BIGINT DEFAULT NULL, | 102 | CreationDate BIGINT DEFAULT NULL, |
103 | Type INT DEFAULT NULL, | ||
103 | InvType INT DEFAULT NULL, | 104 | InvType INT DEFAULT NULL, |
104 | Name VARCHAR(255) DEFAULT NULL, | 105 | Name VARCHAR(255) DEFAULT NULL, |
105 | Description VARCHAR(255) DEFAULT NULL, | 106 | Description VARCHAR(255) DEFAULT NULL, |
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs index 89cfd7f..dfb2200 100644 --- a/OpenSim/Data/Tests/BasicRegionTest.cs +++ b/OpenSim/Data/Tests/BasicRegionTest.cs | |||
@@ -649,8 +649,9 @@ namespace OpenSim.Data.Tests | |||
649 | Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID)); | 649 | Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID)); |
650 | // Where is this group permissions?? | 650 | // Where is this group permissions?? |
651 | // Assert.That(t.GroupPermissions,Is.EqualTo()); | 651 | // Assert.That(t.GroupPermissions,Is.EqualTo()); |
652 | Assert.That(t.InvType,Is.EqualTo(invtype)); | 652 | Assert.That(t.Type,Is.EqualTo(assettype)); |
653 | Assert.That(t.ItemID,Is.EqualTo(id)); | 653 | Assert.That(t.InvType, Is.EqualTo(invtype)); |
654 | Assert.That(t.ItemID, Is.EqualTo(id)); | ||
654 | Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID)); | 655 | Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID)); |
655 | Assert.That(t.NextPermissions, Is.EqualTo(nextperm)); | 656 | Assert.That(t.NextPermissions, Is.EqualTo(nextperm)); |
656 | // Ownership changes when you drop an object into an object | 657 | // Ownership changes when you drop an object into an object |