made SOP have a blank setter for 2 convenience properties.

Got RegionStore mapping to the point that nhibernate would start, though
definitely not complete
0.6.0-stable
Sean Dague 2008-07-16 21:27:52 +00:00
parent 58a0d0bb32
commit 194ffb4d88
3 changed files with 17 additions and 13 deletions

View File

@ -45,12 +45,7 @@ CREATE TABLE `Prims` (
`OwnerID` char(36) default NULL,
`GroupID` char(36) default NULL,
`LastOwnerID` char(36) default NULL,
PRIMARY KEY (`UUID`),
KEY `prims_regionuuid` (`RegionID`),
KEY 'prims_parentuuid' ('ParentUUID')
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
CREATE TABLE `PrimShapes` (
-- this is the shape
`Shape` int(11) default NULL,
`ScaleX` float default NULL,
`ScaleY` float default NULL,
@ -77,6 +72,8 @@ CREATE TABLE `PrimShapes` (
`State` int(11) default NULL,
`Texture` longblob,
`ExtraParams` longblob,
`UUID` char(36) NOT NULL default '',
PRIMARY KEY (`UUID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
PRIMARY KEY (`UUID`),
KEY `prims_regionuuid` (`RegionID`),
KEY 'prims_parentuuid' ('ParentUUID')
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
<class name="OpenSim.Region.Environment.Scene.SceneObjectPart, OpenSim.Region.Environment.Scene" table="Prims" lazy="false">
<class name="OpenSim.Region.Environment.Scenes.SceneObjectPart, OpenSim.Region.Environment" table="Prims" lazy="false">
<id name="UUID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate">
<generator class="assigned" />
</id>
@ -75,9 +75,14 @@
<column name="SitTargetOrientW" />
</property>
<class name="PrimShape" type="OpenSim.Framework.PrimitiveBaseShape, OpenSim.Framework">
<property name="
</class>
<component name="Shape">
<property name="Scale" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
<column name="ScaleX" />
<column name="ScaleY" />
<column name="ScaleZ" />
</property>
</component>
</class>
</hibernate-mapping>

View File

@ -929,11 +929,13 @@ namespace OpenSim.Region.Environment.Scenes
public LLUUID RegionID
{
get { return ParentGroup.Scene.RegionInfo.RegionID; }
set {} // read only
}
[XmlIgnore]
public LLUUID ParentUUID
{
get { return ParentGroup.UUID; }
set {} // read only
}
#endregion Public Properties with only Get