diff options
author | Justin Clarke Casey | 2008-12-01 18:42:14 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-01 18:42:14 +0000 |
commit | 80520206fcd4c8c85eb28b4800c42136365b164d (patch) | |
tree | 9a5f583028198b44b0dc98b409fa410a4dab6418 /OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | |
parent | * Temporarily revert nhibernate.dll to the previous one (diff) | |
download | opensim-SC-80520206fcd4c8c85eb28b4800c42136365b164d.zip opensim-SC-80520206fcd4c8c85eb28b4800c42136365b164d.tar.gz opensim-SC-80520206fcd4c8c85eb28b4800c42136365b164d.tar.bz2 opensim-SC-80520206fcd4c8c85eb28b4800c42136365b164d.tar.xz |
* Unforunately it turns out not to be that simple. Revert the rest of r7560 for now.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | 85 |
1 files changed, 26 insertions, 59 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml index 1851904..fe055bb 100644 --- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml | |||
@@ -4,7 +4,7 @@ | |||
4 | <id name="UUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> | 4 | <id name="UUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> |
5 | <generator class="assigned" /> | 5 | <generator class="assigned" /> |
6 | </id> | 6 | </id> |
7 | <property name="ParentID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate"/> | 7 | <property name="ParentID" type="System.UInt32"/> |
8 | <property name="ParentUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 8 | <property name="ParentUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
9 | <property name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 9 | <property name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
10 | <property name="CreationDate" type="System.Int32" /> | 10 | <property name="CreationDate" type="System.Int32" /> |
@@ -14,17 +14,17 @@ | |||
14 | <property name="SitName" type="String" length="255" /> | 14 | <property name="SitName" type="String" length="255" /> |
15 | <property name="TouchName" type="String" length="255" /> | 15 | <property name="TouchName" type="String" length="255" /> |
16 | 16 | ||
17 | <property name="ObjectFlags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 17 | <property name="ObjectFlags" type="System.UInt32" /> |
18 | <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 18 | <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
19 | <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 19 | <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
20 | <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 20 | <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
21 | <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 21 | <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
22 | 22 | ||
23 | <property name="OwnerMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 23 | <property name="OwnerMask" type="System.UInt32" /> |
24 | <property name="NextOwnerMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 24 | <property name="NextOwnerMask" type="System.UInt32" /> |
25 | <property name="GroupMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 25 | <property name="GroupMask" type="System.UInt32" /> |
26 | <property name="EveryoneMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 26 | <property name="EveryoneMask" type="System.UInt32" /> |
27 | <property name="BaseMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 27 | <property name="BaseMask" type="System.UInt32" /> |
28 | 28 | ||
29 | <property name="OffsetPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" > | 29 | <property name="OffsetPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" > |
30 | <column name="PositionX" /> | 30 | <column name="PositionX" /> |
@@ -83,24 +83,24 @@ | |||
83 | <column name="ScaleZ" /> | 83 | <column name="ScaleZ" /> |
84 | </property> | 84 | </property> |
85 | <property name="PCode" type="System.Byte" /> | 85 | <property name="PCode" type="System.Byte" /> |
86 | <property name="PathBegin" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> | 86 | <property name="PathBegin" type="System.UInt16" /> |
87 | <property name="PathEnd" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> | 87 | <property name="PathEnd" type="System.UInt16" /> |
88 | <property name="PathScaleX" type="System.Byte" /> | 88 | <property name="PathScaleX" type="System.Byte" /> |
89 | <property name="PathScaleY" type="System.Byte" /> | 89 | <property name="PathScaleY" type="System.Byte" /> |
90 | <property name="PathShearX" type="System.Byte" /> | 90 | <property name="PathShearX" type="System.Byte" /> |
91 | <property name="PathShearY" type="System.Byte" /> | 91 | <property name="PathShearY" type="System.Byte" /> |
92 | <property name="PathSkew" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> | 92 | <property name="PathSkew" type="System.SByte" /> |
93 | <property name="PathCurve" type="System.Byte" /> | 93 | <property name="PathCurve" type="System.Byte" /> |
94 | <property name="PathRadiusOffset" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> | 94 | <property name="PathRadiusOffset" type="System.SByte" /> |
95 | <property name="PathRevolutions" type="System.Byte" /> | 95 | <property name="PathRevolutions" type="System.Byte" /> |
96 | <property name="PathTaperX" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> | 96 | <property name="PathTaperX" type="System.SByte" /> |
97 | <property name="PathTwist" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> | 97 | <property name="PathTwist" type="System.SByte" /> |
98 | <property name="ProfileBegin" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> | 98 | <property name="ProfileBegin" type="System.UInt16" /> |
99 | <property name="ProfileEnd" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> | 99 | <property name="ProfileEnd" type="System.UInt16" /> |
100 | <property name="ProfileCurve" type="System.Byte" /> | 100 | <property name="ProfileCurve" type="System.Byte" /> |
101 | <property name="ProfileHollow" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> | 101 | <property name="ProfileHollow" type="System.UInt16" /> |
102 | <property name="TextureEntry" column="Texture" type="binary" /> | 102 | <property name="TextureEntry" column="Texture" type="System.Byte[]" /> |
103 | <property name="ExtraParams" type="binary" /> | 103 | <property name="ExtraParams" type="System.Byte[]" /> |
104 | <property name="State" type="System.Byte" /> | 104 | <property name="State" type="System.Byte" /> |
105 | </component> | 105 | </component> |
106 | </class> | 106 | </class> |
@@ -108,8 +108,7 @@ | |||
108 | <id name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> | 108 | <id name="RegionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> |
109 | <generator class="assigned" /> | 109 | <generator class="assigned" /> |
110 | </id> | 110 | </id> |
111 | <!-- <property name="MapData" type="OpenSim.Data.NHibernate.BlobType, OpenSim.Data.NHibernate" /> --> | 111 | <property name="Map" type="System.Byte[]" /> |
112 | <property name="MapData" type="binary" /> | ||
113 | </class> | 112 | </class> |
114 | <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false"> | 113 | <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false"> |
115 | <id name="ItemID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> | 114 | <id name="ItemID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> |
@@ -122,47 +121,15 @@ | |||
122 | <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | 121 | <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> |
123 | <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | 122 | <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> |
124 | <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | 123 | <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> |
125 | <property name="CurrentPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 124 | <property name="CurrentPermissions" type="System.UInt32" /> |
126 | <property name="BasePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 125 | <property name="BasePermissions" type="System.UInt32" /> |
127 | <property name="EveryonePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 126 | <property name="EveryonePermissions" type="System.UInt32" /> |
128 | <property name="GroupPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 127 | <property name="GroupPermissions" type="System.UInt32" /> |
129 | <property name="NextPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 128 | <property name="NextPermissions" type="System.UInt32" /> |
130 | <property name="Name" type="String" length="255" /> | 129 | <property name="Name" type="String" length="255" /> |
131 | <property name="Description" type="String" length="255" /> | 130 | <property name="Description" type="String" length="255" /> |
132 | <property name="CreationDate" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 131 | <property name="CreationDate" type="System.UInt32" /> |
133 | <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | 132 | <property name="Flags" type="System.UInt32" /> |
134 | <property name="InvType" type="System.Int32" /> | 133 | <property name="InvType" type="System.Int32" /> |
135 | </class> | 134 | </class> |
136 | <class name="OpenSim.Data.RegionProfileData, OpenSim.Data" table="Regions" lazy="false"> | ||
137 | <id name="Uuid" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> | ||
138 | <generator class="assigned" /> | ||
139 | </id> | ||
140 | <property name="RegionHandle" index="region_handle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
141 | <property name="RegionName" index="region_name" type="String" length="32"/> | ||
142 | <property name="RegionRecvKey" type="String" length="128"/> | ||
143 | <property name="RegionSendKey" type="String" length="128"/> | ||
144 | <property name="RegionSecret" type="String" length="128"/> | ||
145 | <property name="RegionDataURI" type="String" length="255"/> | ||
146 | <property name="ServerIP" type="String" length="64"/> | ||
147 | <property name="ServerPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
148 | <property name="ServerURI" type="String" length="255"/> | ||
149 | <property name="RegionLocX" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
150 | <property name="RegionLocY" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
151 | <property name="RegionLocZ" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
152 | <property name="EastOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
153 | <property name="WestOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
154 | <property name="SouthOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
155 | <property name="NorthOverrideHandle" index="overrideHandles" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> | ||
156 | <property name="RegionAssetURI" type="String" length="255"/> | ||
157 | <property name="RegionAssetRecvKey" type="String" length="128"/> | ||
158 | <property name="RegionAssetSendKey" type="String" length="128"/> | ||
159 | <property name="RegionUserURI" type="String" length="255"/> | ||
160 | <property name="RegionUserRecvKey" type="String" length="128"/> | ||
161 | <property name="RegionUserSendKey" type="String" length="128"/> | ||
162 | <property name="ServerHttpPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
163 | <property name="ServerRemotingPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> | ||
164 | <property name="RegionMapTextureID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | ||
165 | <property name="Owner_uuid" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | ||
166 | <property name="OriginUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | ||
167 | </class> | ||
168 | </hibernate-mapping> | 135 | </hibernate-mapping> |