From 6119b02860ccad928cacb071c4cd07cb99cddacf Mon Sep 17 00:00:00 2001
From: idb
Date: Fri, 20 Feb 2009 22:56:40 +0000
Subject: * Apply http://opensimulator.org/mantis/view.php?id=3185 * Fixes
NHibernate problem where prim contents show as textures * Thanks Tommil!
---
.../Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql | 1 +
OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql | 1 +
.../Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql | 1 +
OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | 1 +
OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql | 1 +
OpenSim/Data/Tests/BasicRegionTest.cs | 5 +++--
6 files changed, 8 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Data')
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 (
Description NVARCHAR(255) null,
CreationDate INT null,
Flags INT null,
+ Type INT null,
InvType INT null,
primary key (ItemID)
)
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 (
LastOwnerID VARCHAR(36) DEFAULT NULL,
CreatorID VARCHAR(36) DEFAULT NULL,
CreationDate BIGINT DEFAULT NULL,
+ Type INT DEFAULT NULL,
InvType INT DEFAULT NULL,
Name VARCHAR(255) DEFAULT NULL,
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 (
LastOwnerID VARCHAR(36) DEFAULT NULL,
CreatorID VARCHAR(36) DEFAULT NULL,
CreationDate INT DEFAULT NULL,
+ Type INT DEFAULT NULL,
InvType INT DEFAULT NULL,
Name VARCHAR(255) DEFAULT NULL,
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 @@
<property name="CreationDate" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
<property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
<property name="InvType" type="System.Int32" />
+ <property name="Type" type="System.Int32" />
</class>
</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 (
LastOwnerID VARCHAR(36) DEFAULT NULL,
CreatorID VARCHAR(36) DEFAULT NULL,
CreationDate BIGINT DEFAULT NULL,
+ Type INT DEFAULT NULL,
InvType INT DEFAULT NULL,
Name VARCHAR(255) DEFAULT NULL,
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
Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID));
// Where is this group permissions??
// Assert.That(t.GroupPermissions,Is.EqualTo());
- Assert.That(t.InvType,Is.EqualTo(invtype));
- Assert.That(t.ItemID,Is.EqualTo(id));
+ Assert.That(t.Type,Is.EqualTo(assettype));
+ Assert.That(t.InvType, Is.EqualTo(invtype));
+ Assert.That(t.ItemID, Is.EqualTo(id));
Assert.That(t.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID));
Assert.That(t.NextPermissions, Is.EqualTo(nextperm));
// Ownership changes when you drop an object into an object
--
cgit v1.1