OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Apply http://opensimulator.org/mantis/view.php?id=3185 

* Fixes NHibernate problem where prim contents show as textures
* Thanks Tommil!
GenericGridServerConcept
idb 2009-02-20 22:56:40 +00:00
parent 42e67783b4
commit 6119b02860
6 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Data/NHibernate/Resources/MsSql2005Dialect/001_RegionStore.sql
View File

@ -90,6 +90,7 @@ create table PrimItems (
Description NVARCHAR(255) null, Description NVARCHAR(255) null,
CreationDate INT null, CreationDate INT null,
Flags INT null, Flags INT null,
Type INT null,
InvType INT null, InvType INT null,
primary key (ItemID) primary key (ItemID)
) )

1
OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql
View File

@ -100,6 +100,7 @@ CREATE TABLE PrimItems (
LastOwnerID VARCHAR(36) DEFAULT NULL, LastOwnerID VARCHAR(36) DEFAULT NULL,
CreatorID VARCHAR(36) DEFAULT NULL, CreatorID VARCHAR(36) DEFAULT NULL,
CreationDate BIGINT DEFAULT NULL, CreationDate BIGINT DEFAULT NULL,
Type INT DEFAULT NULL,
InvType INT DEFAULT NULL, InvType INT DEFAULT NULL,
Name VARCHAR(255) DEFAULT NULL, Name VARCHAR(255) DEFAULT NULL,
Description VARCHAR(255) DEFAULT NULL, Description VARCHAR(255) DEFAULT NULL,

1
OpenSim/Data/NHibernate/Resources/PostgreSQLDialect/001_RegionStore.sql
View File

@ -100,6 +100,7 @@ CREATE TABLE PrimItems (
LastOwnerID VARCHAR(36) DEFAULT NULL, LastOwnerID VARCHAR(36) DEFAULT NULL,
CreatorID VARCHAR(36) DEFAULT NULL, CreatorID VARCHAR(36) DEFAULT NULL,
CreationDate INT DEFAULT NULL, CreationDate INT DEFAULT NULL,
Type INT DEFAULT NULL,
InvType INT DEFAULT NULL, InvType INT DEFAULT NULL,
Name VARCHAR(255) DEFAULT NULL, Name VARCHAR(255) DEFAULT NULL,
Description VARCHAR(255) DEFAULT NULL, Description VARCHAR(255) DEFAULT NULL,

1
OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
View File

@ -141,6 +141,7 @@
<property name="CreationDate" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> <property name="CreationDate" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" />
<property name="Flags" 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="InvType" type="System.Int32" />
<property name="Type" type="System.Int32" />
</class> </class>
</hibernate-mapping> </hibernate-mapping>

1
OpenSim/Data/NHibernate/Resources/SQLiteDialect/001_RegionStore.sql
View File

@ -100,6 +100,7 @@ CREATE TABLE PrimItems (
LastOwnerID VARCHAR(36) DEFAULT NULL, LastOwnerID VARCHAR(36) DEFAULT NULL,
CreatorID VARCHAR(36) DEFAULT NULL, CreatorID VARCHAR(36) DEFAULT NULL,
CreationDate BIGINT DEFAULT NULL, CreationDate BIGINT DEFAULT NULL,
Type INT DEFAULT NULL,
InvType INT DEFAULT NULL, InvType INT DEFAULT NULL,
Name VARCHAR(255) DEFAULT NULL, Name VARCHAR(255) DEFAULT NULL,
Description VARCHAR(255) DEFAULT NULL, Description VARCHAR(255) DEFAULT NULL,

5
OpenSim/Data/Tests/BasicRegionTest.cs
View File

@ -649,8 +649,9 @@ namespace OpenSim.Data.Tests
Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID)); Assert.That(t.GroupID,Is.EqualTo(sog.RootPart.GroupID));
// Where is this group permissions?? // Where is this group permissions??
// Assert.That(t.GroupPermissions,Is.EqualTo()); // Assert.That(t.GroupPermissions,Is.EqualTo());
Assert.That(t.InvType,Is.EqualTo(invtype)); Assert.That(t.Type,Is.EqualTo(assettype));
Assert.That(t.ItemID,Is.EqualTo(id)); 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.LastOwnerID, Is.EqualTo(sog.RootPart.LastOwnerID));
Assert.That(t.NextPermissions, Is.EqualTo(nextperm)); Assert.That(t.NextPermissions, Is.EqualTo(nextperm));
// Ownership changes when you drop an object into an object // Ownership changes when you drop an object into an object