diff options
author | Justin Clarke Casey | 2008-12-02 15:22:58 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-02 15:22:58 +0000 |
commit | dde32f1130f83f9471fea474b1ebc9e0520be561 (patch) | |
tree | dc8683d7b14ada4aa07497da3ed4b5d7b79c57b8 /OpenSim/Data/NHibernate/Resources | |
parent | * Resolve http://opensimulator.org/mantis/view.php?id=2743 and http://opensim... (diff) | |
download | opensim-SC_OLD-dde32f1130f83f9471fea474b1ebc9e0520be561.zip opensim-SC_OLD-dde32f1130f83f9471fea474b1ebc9e0520be561.tar.gz opensim-SC_OLD-dde32f1130f83f9471fea474b1ebc9e0520be561.tar.bz2 opensim-SC_OLD-dde32f1130f83f9471fea474b1ebc9e0520be561.tar.xz |
* Reapply http://opensimulator.org/mantis/view.php?id=2710
* This patch gets NHibernate working
*** PLEASE NOTE: This patch now requires the libmono-oracle2.0-cil library to be installed on Ubuntu (to stop the System.Data.Oracle missing failure) ***
* Not sure what the dependency is on other distros. Adding this info to http://opensimulator.org/wiki/Build_Instructions would be most welcome
* Adds Castle.* libraries that were missing last time (note, dlls have been added from http://downloads.sourceforge.net/nhibernate/NHibernate-2.0.1.GA-bin.zip)
Diffstat (limited to '')
7 files changed, 74 insertions, 41 deletions
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml index 7c3d8cf..7c42609 100644 --- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml | |||
@@ -4,7 +4,7 @@ | |||
4 | <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> | 4 | <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> |
5 | <generator class="assigned" /> | 5 | <generator class="assigned" /> |
6 | </id> | 6 | </id> |
7 | <property name="Type" type="System.SByte" /> | 7 | <property name="Type" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> |
8 | <property name="Name" type="String" length="64" /> | 8 | <property name="Name" type="String" length="64" /> |
9 | <property name="Description" type="String" length="64" /> | 9 | <property name="Description" type="String" length="64" /> |
10 | <property name="Local" type="boolean" /> | 10 | <property name="Local" type="boolean" /> |
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml index 6afe9fa..c5f0115 100644 --- a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml | |||
@@ -5,7 +5,7 @@ | |||
5 | <generator class="assigned" /> | 5 | <generator class="assigned" /> |
6 | </id> | 6 | </id> |
7 | <property name="Type" type="Int16" /> | 7 | <property name="Type" type="Int16" /> |
8 | <property name="Version" type="System.UInt16" /> | 8 | <property name="Version" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> |
9 | <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 9 | <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
10 | <property name="Owner" index="folder_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 10 | <property name="Owner" index="folder_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
11 | <property name="Name" type="String" length="64" /> | 11 | <property name="Name" type="String" length="64" /> |
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml index 9a4d7ca..f5e365b 100644 --- a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml | |||
@@ -12,15 +12,15 @@ | |||
12 | <property name="Creator" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 12 | <property name="Creator" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
13 | <property name="Name" type="String" length="64" /> | 13 | <property name="Name" type="String" length="64" /> |
14 | <property name="Description" type="String" length="64" /> | 14 | <property name="Description" type="String" length="64" /> |
15 | <property name="NextPermissions" type="System.UInt32" /> | 15 | <property name="NextPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
16 | <property name="CurrentPermissions" type="System.UInt32" /> | 16 | <property name="CurrentPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
17 | <property name="BasePermissions" type="System.UInt32" /> | 17 | <property name="BasePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
18 | <property name="EveryOnePermissions" type="System.UInt32" /> | 18 | <property name="EveryOnePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
19 | <property name="GroupID" index="item_group_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 19 | <property name="GroupID" index="item_group_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
20 | <property name="GroupOwned" type="boolean" /> | 20 | <property name="GroupOwned" type="boolean" /> |
21 | <property name="SalePrice" type="System.Int32" /> | 21 | <property name="SalePrice" type="System.Int32" /> |
22 | <property name="SaleType" type="System.Byte" /> | 22 | <property name="SaleType" type="System.Byte" /> |
23 | <property name="Flags" type="System.UInt32" /> | 23 | <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
24 | <property name="CreationDate" type="System.Int32" /> | 24 | <property name="CreationDate" type="System.Int32" /> |
25 | </class> | 25 | </class> |
26 | </hibernate-mapping> | 26 | </hibernate-mapping> |
diff --git a/OpenSim/Data/NHibernate/Resources/MySQLDialect/002_RegionStore.sql b/OpenSim/Data/NHibernate/Resources/MySQLDialect/002_RegionStore.sql index fc11e95..d34d44e 100644 --- a/OpenSim/Data/NHibernate/Resources/MySQLDialect/002_RegionStore.sql +++ b/OpenSim/Data/NHibernate/Resources/MySQLDialect/002_RegionStore.sql | |||
@@ -2,8 +2,8 @@ BEGIN; | |||
2 | 2 | ||
3 | CREATE TABLE `Terrain` ( | 3 | CREATE TABLE `Terrain` ( |
4 | `RegionID` char(36) not null, | 4 | `RegionID` char(36) not null, |
5 | `Map` longblob, | 5 | `MapData` longblob, |
6 | PRIMARY KEY (`RegionID`) | 6 | PRIMARY KEY (`RegionID`) |
7 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; | 7 | ) ENGINE=InnoDB DEFAULT CHARSET=utf8; |
8 | 8 | ||
9 | COMMIT; \ No newline at end of file | 9 | COMMIT; |
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml index fe055bb..1851904 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="System.UInt32"/> | 7 | <property name="ParentID" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate"/> |
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="System.UInt32" /> | 17 | <property name="ObjectFlags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
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="System.UInt32" /> | 23 | <property name="OwnerMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
24 | <property name="NextOwnerMask" type="System.UInt32" /> | 24 | <property name="NextOwnerMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
25 | <property name="GroupMask" type="System.UInt32" /> | 25 | <property name="GroupMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
26 | <property name="EveryoneMask" type="System.UInt32" /> | 26 | <property name="EveryoneMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
27 | <property name="BaseMask" type="System.UInt32" /> | 27 | <property name="BaseMask" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
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="System.UInt16" /> | 86 | <property name="PathBegin" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> |
87 | <property name="PathEnd" type="System.UInt16" /> | 87 | <property name="PathEnd" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> |
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="System.SByte" /> | 92 | <property name="PathSkew" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> |
93 | <property name="PathCurve" type="System.Byte" /> | 93 | <property name="PathCurve" type="System.Byte" /> |
94 | <property name="PathRadiusOffset" type="System.SByte" /> | 94 | <property name="PathRadiusOffset" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> |
95 | <property name="PathRevolutions" type="System.Byte" /> | 95 | <property name="PathRevolutions" type="System.Byte" /> |
96 | <property name="PathTaperX" type="System.SByte" /> | 96 | <property name="PathTaperX" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> |
97 | <property name="PathTwist" type="System.SByte" /> | 97 | <property name="PathTwist" type="OpenSim.Data.NHibernate.SByteType, OpenSim.Data.NHibernate" /> |
98 | <property name="ProfileBegin" type="System.UInt16" /> | 98 | <property name="ProfileBegin" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> |
99 | <property name="ProfileEnd" type="System.UInt16" /> | 99 | <property name="ProfileEnd" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> |
100 | <property name="ProfileCurve" type="System.Byte" /> | 100 | <property name="ProfileCurve" type="System.Byte" /> |
101 | <property name="ProfileHollow" type="System.UInt16" /> | 101 | <property name="ProfileHollow" type="OpenSim.Data.NHibernate.UInt16Type, OpenSim.Data.NHibernate" /> |
102 | <property name="TextureEntry" column="Texture" type="System.Byte[]" /> | 102 | <property name="TextureEntry" column="Texture" type="binary" /> |
103 | <property name="ExtraParams" type="System.Byte[]" /> | 103 | <property name="ExtraParams" type="binary" /> |
104 | <property name="State" type="System.Byte" /> | 104 | <property name="State" type="System.Byte" /> |
105 | </component> | 105 | </component> |
106 | </class> | 106 | </class> |
@@ -108,7 +108,8 @@ | |||
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="Map" type="System.Byte[]" /> | 111 | <!-- <property name="MapData" type="OpenSim.Data.NHibernate.BlobType, OpenSim.Data.NHibernate" /> --> |
112 | <property name="MapData" type="binary" /> | ||
112 | </class> | 113 | </class> |
113 | <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false"> | 114 | <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false"> |
114 | <id name="ItemID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> | 115 | <id name="ItemID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"> |
@@ -121,15 +122,47 @@ | |||
121 | <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | 122 | <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> |
122 | <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | 123 | <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> |
123 | <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> | 124 | <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/> |
124 | <property name="CurrentPermissions" type="System.UInt32" /> | 125 | <property name="CurrentPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
125 | <property name="BasePermissions" type="System.UInt32" /> | 126 | <property name="BasePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
126 | <property name="EveryonePermissions" type="System.UInt32" /> | 127 | <property name="EveryonePermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
127 | <property name="GroupPermissions" type="System.UInt32" /> | 128 | <property name="GroupPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
128 | <property name="NextPermissions" type="System.UInt32" /> | 129 | <property name="NextPermissions" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
129 | <property name="Name" type="String" length="255" /> | 130 | <property name="Name" type="String" length="255" /> |
130 | <property name="Description" type="String" length="255" /> | 131 | <property name="Description" type="String" length="255" /> |
131 | <property name="CreationDate" type="System.UInt32" /> | 132 | <property name="CreationDate" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
132 | <property name="Flags" type="System.UInt32" /> | 133 | <property name="Flags" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
133 | <property name="InvType" type="System.Int32" /> | 134 | <property name="InvType" type="System.Int32" /> |
134 | </class> | 135 | </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> | ||
135 | </hibernate-mapping> | 168 | </hibernate-mapping> |
diff --git a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml index 0beddaf..e10fb8f 100644 --- a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml | |||
@@ -5,7 +5,7 @@ | |||
5 | <generator class="assigned" /> | 5 | <generator class="assigned" /> |
6 | </id> | 6 | </id> |
7 | <property name="AgentIP" type="String" length="24" /> | 7 | <property name="AgentIP" type="String" length="24" /> |
8 | <property name="AgentPort" type="Int32" /> | 8 | <property name="AgentPort" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
9 | <property name="AgentOnline" type="boolean" /> | 9 | <property name="AgentOnline" type="boolean" /> |
10 | <property name="SessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 10 | <property name="SessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
11 | <property name="SecureSessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 11 | <property name="SecureSessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
@@ -13,9 +13,9 @@ | |||
13 | <property name="Region" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 13 | <property name="Region" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
14 | <property name="LoginTime" type="Int32" /> | 14 | <property name="LoginTime" type="Int32" /> |
15 | <property name="LogoutTime" type="Int32" /> | 15 | <property name="LogoutTime" type="Int32" /> |
16 | <property name="Handle" type="Int64" /> | 16 | <property name="Handle" type="OpenSim.Data.NHibernate.UInt64Type, OpenSim.Data.NHibernate" /> |
17 | <property name="PositionX" type="Single" /> | 17 | <!-- <property name="PositionX" type="Single" /> |
18 | <property name="PositionY" type="Single" /> | 18 | <property name="PositionY" type="Single" /> |
19 | <property name="PositionZ" type="Single" /> | 19 | <property name="PositionZ" type="Single" /> --> |
20 | </class> | 20 | </class> |
21 | </hibernate-mapping> | 21 | </hibernate-mapping> |
diff --git a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml index 873930b..740a9f1 100644 --- a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml +++ b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml | |||
@@ -9,8 +9,8 @@ | |||
9 | <property name="PasswordHash" type="String" length="32" /> | 9 | <property name="PasswordHash" type="String" length="32" /> |
10 | <property name="PasswordSalt" type="String" length="32" /> | 10 | <property name="PasswordSalt" type="String" length="32" /> |
11 | <property name="WebLoginKey" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> | 11 | <property name="WebLoginKey" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" /> |
12 | <property name="HomeRegionX" type="System.UInt32" /> | 12 | <property name="HomeRegionX" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
13 | <property name="HomeRegionY" type="System.UInt32" /> | 13 | <property name="HomeRegionY" type="OpenSim.Data.NHibernate.UInt32Type, OpenSim.Data.NHibernate" /> |
14 | <property name="HomeLocationX" type="Single" /> | 14 | <property name="HomeLocationX" type="Single" /> |
15 | <property name="HomeLocationY" type="Single" /> | 15 | <property name="HomeLocationY" type="Single" /> |
16 | <property name="HomeLocationZ" type="Single" /> | 16 | <property name="HomeLocationZ" type="Single" /> |