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

few additional fixed to get prim inventory up on nhibernate

0.6.0-stable
Sean Dague 2008-07-23 22:14:37 +00:00
parent c38b811f5d
commit 1c9551eaae
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/NHibernate/NHibernateRegionData.cs
View File

@ -259,7 +259,9 @@ namespace OpenSim.Data.NHibernate
{ {
inventory.Add(i); inventory.Add(i);
} }
p.RestoreInventoryItems(inventory);
if (inventory.Count > 0)
p.RestoreInventoryItems(inventory);
} }
foreach (SceneObjectGroup g in SOG.Values) foreach (SceneObjectGroup g in SOG.Values)
{ {

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

@ -2,7 +2,6 @@ BEGIN;
CREATE TABLE `PrimItems` ( CREATE TABLE `PrimItems` (
`InvType` int(11) default NULL, `InvType` int(11) default NULL,
`AssetType` int(11) default NULL,
`Name` varchar(255) default NULL, `Name` varchar(255) default NULL,
`Description` varchar(255) default NULL, `Description` varchar(255) default NULL,
`CreationDate` bigint(20) default NULL, `CreationDate` bigint(20) default NULL,

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

@ -116,7 +116,7 @@
</id> </id>
<property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
<property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
<property name="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
<property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
<property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
<property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/>
@ -131,6 +131,5 @@
<property name="CreationDate" type="System.UInt32" /> <property name="CreationDate" type="System.UInt32" />
<property name="Flags" type="System.UInt32" /> <property name="Flags" type="System.UInt32" />
<property name="InvType" type="System.Int32" /> <property name="InvType" type="System.Int32" />
<property name="AssetType" type="System.Int32" />
</class> </class>
</hibernate-mapping> </hibernate-mapping>