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

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

* Changes the NHibernate asset mapping and expose FullID on AssetBase for NHibernate
* mikem has seen this patch :)
0.6.3-post-fixes
Justin Clarke Casey 2009-02-09 17:31:03 +00:00
parent 828049ac8f
commit eddcf620d8
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
View File

@ -4,11 +4,13 @@
<id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
<generator class="assigned" /> <generator class="assigned" />
</id> </id>
<property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
<property name="Name" type="String" length="64" />
<property name="Description" type="String" length="64" />
<property name="Local" type="boolean" />
<property name="Temporary" type="boolean" />
<property name="Data" type="binary" /> <property name="Data" type="binary" />
<component name="Metadata">
<property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" />
<property name="Name" type="String" length="64" />
<property name="Description" type="String" length="64" />
<property name="Local" type="boolean" />
<property name="Temporary" type="boolean" />
</component>
</class> </class>
</hibernate-mapping> </hibernate-mapping>

9
OpenSim/Framework/AssetBase.cs
View File

@ -61,6 +61,15 @@ namespace OpenSim.Framework
get { return _metadata; } get { return _metadata; }
set { _metadata = value; } set { _metadata = value; }
} }
// We expose FullID here because the NHibernate mappers require a
// property on the AssetBase class for its primary key (see
// OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml).
public UUID FullID
{
get { return Metadata.FullID; }
set { Metadata.FullID = value; }
}
} }
[Serializable] [Serializable]