diff options
author | Sean Dague | 2008-07-16 21:27:52 +0000 |
---|---|---|
committer | Sean Dague | 2008-07-16 21:27:52 +0000 |
commit | 194ffb4d88266fcea4cd2e79e4844505c5d663f8 (patch) | |
tree | 0aee15b9b86e343ae320f97d039e233c703f3a00 /OpenSim/Data/NHibernate | |
parent | be a little more discriminating on firing ShapeChanged script events (diff) | |
download | opensim-SC-194ffb4d88266fcea4cd2e79e4844505c5d663f8.zip opensim-SC-194ffb4d88266fcea4cd2e79e4844505c5d663f8.tar.gz opensim-SC-194ffb4d88266fcea4cd2e79e4844505c5d663f8.tar.bz2 opensim-SC-194ffb4d88266fcea4cd2e79e4844505c5d663f8.tar.xz |
made SOP have a blank setter for 2 convenience properties.
Got RegionStore mapping to the point that nhibernate would start, though
definitely not complete
Diffstat (limited to 'OpenSim/Data/NHibernate')
-rw-r--r-- | OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql | 15 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | 13 |
2 files changed, 15 insertions, 13 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql index ede281c..1811a44 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/001_RegionStore.sql | |||
@@ -45,12 +45,7 @@ CREATE TABLE `Prims` ( | |||
45 | `OwnerID` char(36) default NULL, | 45 | `OwnerID` char(36) default NULL, |
46 | `GroupID` char(36) default NULL, | 46 | `GroupID` char(36) default NULL, |
47 | `LastOwnerID` char(36) default NULL, | 47 | `LastOwnerID` char(36) default NULL, |
48 | PRIMARY KEY (`UUID`), | 48 | -- this is the shape |
49 | KEY `prims_regionuuid` (`RegionID`), | ||
50 | KEY 'prims_parentuuid' ('ParentUUID') | ||
51 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | ||
52 | |||
53 | CREATE TABLE `PrimShapes` ( | ||
54 | `Shape` int(11) default NULL, | 49 | `Shape` int(11) default NULL, |
55 | `ScaleX` float default NULL, | 50 | `ScaleX` float default NULL, |
56 | `ScaleY` float default NULL, | 51 | `ScaleY` float default NULL, |
@@ -77,6 +72,8 @@ CREATE TABLE `PrimShapes` ( | |||
77 | `State` int(11) default NULL, | 72 | `State` int(11) default NULL, |
78 | `Texture` longblob, | 73 | `Texture` longblob, |
79 | `ExtraParams` longblob, | 74 | `ExtraParams` longblob, |
80 | `UUID` char(36) NOT NULL default '', | 75 | PRIMARY KEY (`UUID`), |
81 | PRIMARY KEY (`UUID`) | 76 | KEY `prims_regionuuid` (`RegionID`), |
82 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | 77 | KEY 'prims_parentuuid' ('ParentUUID') |
78 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | ||
79 | |||
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml index 0004444..4fe01e1 100644 --- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | 1 | <?xml version="1.0" encoding="utf-8" ?> |
2 | <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> | 2 | <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2"> |
3 | <class name="OpenSim.Region.Environment.Scene.SceneObjectPart, OpenSim.Region.Environment.Scene" table="Prims" lazy="false"> | 3 | <class name="OpenSim.Region.Environment.Scenes.SceneObjectPart, OpenSim.Region.Environment" table="Prims" lazy="false"> |
4 | <id name="UUID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> | 4 | <id name="UUID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> |
5 | <generator class="assigned" /> | 5 | <generator class="assigned" /> |
6 | </id> | 6 | </id> |
@@ -75,9 +75,14 @@ | |||
75 | <column name="SitTargetOrientW" /> | 75 | <column name="SitTargetOrientW" /> |
76 | </property> | 76 | </property> |
77 | 77 | ||
78 | <class name="PrimShape" type="OpenSim.Framework.PrimitiveBaseShape, OpenSim.Framework"> | 78 | <component name="Shape"> |
79 | <property name=" | 79 | <property name="Scale" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > |
80 | </class> | 80 | <column name="ScaleX" /> |
81 | <column name="ScaleY" /> | ||
82 | <column name="ScaleZ" /> | ||
83 | </property> | ||
84 | |||
85 | </component> | ||
81 | 86 | ||
82 | </class> | 87 | </class> |
83 | </hibernate-mapping> \ No newline at end of file | 88 | </hibernate-mapping> \ No newline at end of file |