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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> <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"> <id name="UUID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate">
<generator class="assigned" /> <generator class="assigned" />
</id> </id>
@ -75,9 +75,14 @@
<column name="SitTargetOrientW" /> <column name="SitTargetOrientW" />
</property> </property>
<class name="PrimShape" type="OpenSim.Framework.PrimitiveBaseShape, OpenSim.Framework"> <component name="Shape">
<property name=" <property name="Scale" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" >
</class> <column name="ScaleX" />
<column name="ScaleY" />
<column name="ScaleZ" />
</property>
</component>
</class> </class>
</hibernate-mapping> </hibernate-mapping>

2
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

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