aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/NHibernate
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/NHibernate/LLQuaternionUserType.cs15
-rw-r--r--OpenSim/Data/NHibernate/LLUUIDUserType.cs10
-rw-r--r--OpenSim/Data/NHibernate/LLVector3UserType.cs12
-rw-r--r--OpenSim/Data/NHibernate/NHibernateAssetData.cs8
-rw-r--r--OpenSim/Data/NHibernate/NHibernateInventoryData.cs28
-rw-r--r--OpenSim/Data/NHibernate/NHibernateRegionData.cs28
-rw-r--r--OpenSim/Data/NHibernate/NHibernateUserData.cs36
-rw-r--r--OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml4
-rw-r--r--OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml8
-rw-r--r--OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml14
-rw-r--r--OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml52
-rw-r--r--OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml12
-rw-r--r--OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml56
-rw-r--r--OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml12
-rw-r--r--OpenSim/Data/NHibernate/Terrain.cs10
-rw-r--r--OpenSim/Data/NHibernate/TextureUserType.cs14
16 files changed, 159 insertions, 160 deletions
diff --git a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
index 80fb9ff..7431433 100644
--- a/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
+++ b/OpenSim/Data/NHibernate/LLQuaternionUserType.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using OpenMetaverse;
31using NHibernate; 31using NHibernate;
32using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 33using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
37 [Serializable] 37 [Serializable]
38 public class LLQuaternionUserType: IUserType 38 public class QuaternionUserType: IUserType
39 { 39 {
40 public object Assemble(object cached, object owner) 40 public object Assemble(object cached, object owner)
41 { 41 {
@@ -49,9 +49,8 @@ namespace OpenSim.Data.NHibernate
49 49
50 public object DeepCopy(object quat) 50 public object DeepCopy(object quat)
51 { 51 {
52 // silly libsecondlife having no copy constructor 52 Quaternion q = (Quaternion)quat;
53 LLQuaternion q = (LLQuaternion) quat; 53 return new Quaternion(q);
54 return new LLQuaternion(q.X, q.Y, q.Z, q.W);
55 } 54 }
56 55
57 public object Disassemble(object quat) 56 public object Disassemble(object quat)
@@ -79,14 +78,14 @@ namespace OpenSim.Data.NHibernate
79 int w = rs.GetOrdinal(names[3]); 78 int w = rs.GetOrdinal(names[3]);
80 if (!rs.IsDBNull(x)) 79 if (!rs.IsDBNull(x))
81 { 80 {
82 quat = new LLQuaternion((Single)rs[x], (Single)rs[y], (Single)rs[z], (Single)rs[w]); 81 quat = new Quaternion((Single)rs[x], (Single)rs[y], (Single)rs[z], (Single)rs[w]);
83 } 82 }
84 return quat; 83 return quat;
85 } 84 }
86 85
87 public void NullSafeSet(IDbCommand cmd, object obj, int index) 86 public void NullSafeSet(IDbCommand cmd, object obj, int index)
88 { 87 {
89 LLQuaternion quat = (LLQuaternion)obj; 88 Quaternion quat = (Quaternion)obj;
90 ((IDataParameter)cmd.Parameters[index]).Value = quat.X; 89 ((IDataParameter)cmd.Parameters[index]).Value = quat.X;
91 ((IDataParameter)cmd.Parameters[index + 1]).Value = quat.Y; 90 ((IDataParameter)cmd.Parameters[index + 1]).Value = quat.Y;
92 ((IDataParameter)cmd.Parameters[index + 2]).Value = quat.Z; 91 ((IDataParameter)cmd.Parameters[index + 2]).Value = quat.Z;
@@ -100,7 +99,7 @@ namespace OpenSim.Data.NHibernate
100 99
101 public Type ReturnedType 100 public Type ReturnedType
102 { 101 {
103 get { return typeof(LLQuaternion); } 102 get { return typeof(Quaternion); }
104 } 103 }
105 104
106 public SqlType[] SqlTypes 105 public SqlType[] SqlTypes
diff --git a/OpenSim/Data/NHibernate/LLUUIDUserType.cs b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
index 0f10344..a7781a3 100644
--- a/OpenSim/Data/NHibernate/LLUUIDUserType.cs
+++ b/OpenSim/Data/NHibernate/LLUUIDUserType.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using OpenMetaverse;
31using NHibernate; 31using NHibernate;
32using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 33using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
37 [Serializable] 37 [Serializable]
38 public class LLUUIDUserType: IUserType 38 public class UUIDUserType: IUserType
39 { 39 {
40 public object Assemble(object cached, object owner) 40 public object Assemble(object cached, object owner)
41 { 41 {
@@ -75,7 +75,7 @@ namespace OpenSim.Data.NHibernate
75 if (!rs.IsDBNull(ord)) 75 if (!rs.IsDBNull(ord))
76 { 76 {
77 string first = (string)rs.GetString(ord); 77 string first = (string)rs.GetString(ord);
78 uuid = new LLUUID(first); 78 uuid = new UUID(first);
79 } 79 }
80 80
81 return uuid; 81 return uuid;
@@ -83,7 +83,7 @@ namespace OpenSim.Data.NHibernate
83 83
84 public void NullSafeSet(IDbCommand cmd, object obj, int index) 84 public void NullSafeSet(IDbCommand cmd, object obj, int index)
85 { 85 {
86 LLUUID uuid = (LLUUID)obj; 86 UUID uuid = (UUID)obj;
87 ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString(); 87 ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString();
88 } 88 }
89 89
@@ -94,7 +94,7 @@ namespace OpenSim.Data.NHibernate
94 94
95 public Type ReturnedType 95 public Type ReturnedType
96 { 96 {
97 get { return typeof(LLUUID); } 97 get { return typeof(UUID); }
98 } 98 }
99 99
100 public SqlType[] SqlTypes 100 public SqlType[] SqlTypes
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
index d2df2c4..cdd15ec 100644
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using OpenMetaverse;
31using NHibernate; 31using NHibernate;
32using NHibernate.SqlTypes; 32using NHibernate.SqlTypes;
33using NHibernate.UserTypes; 33using NHibernate.UserTypes;
@@ -35,7 +35,7 @@ using NHibernate.UserTypes;
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
37 [Serializable] 37 [Serializable]
38 public class LLVector3UserType: IUserType 38 public class Vector3UserType: IUserType
39 { 39 {
40 public object Assemble(object cached, object owner) 40 public object Assemble(object cached, object owner)
41 { 41 {
@@ -49,7 +49,7 @@ namespace OpenSim.Data.NHibernate
49 49
50 public object DeepCopy(object vector) 50 public object DeepCopy(object vector)
51 { 51 {
52 return new LLVector3((LLVector3) vector); 52 return new Vector3((Vector3) vector);
53 } 53 }
54 54
55 public object Disassemble(object vector) 55 public object Disassemble(object vector)
@@ -76,14 +76,14 @@ namespace OpenSim.Data.NHibernate
76 int z = rs.GetOrdinal(names[2]); 76 int z = rs.GetOrdinal(names[2]);
77 if (!rs.IsDBNull(x)) 77 if (!rs.IsDBNull(x))
78 { 78 {
79 vector = new LLVector3((Single)rs[x], (Single)rs[y], (Single)rs[z]); 79 vector = new Vector3((Single)rs[x], (Single)rs[y], (Single)rs[z]);
80 } 80 }
81 return vector; 81 return vector;
82 } 82 }
83 83
84 public void NullSafeSet(IDbCommand cmd, object obj, int index) 84 public void NullSafeSet(IDbCommand cmd, object obj, int index)
85 { 85 {
86 LLVector3 vector = (LLVector3)obj; 86 Vector3 vector = (Vector3)obj;
87 ((IDataParameter)cmd.Parameters[index]).Value = vector.X; 87 ((IDataParameter)cmd.Parameters[index]).Value = vector.X;
88 ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y; 88 ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y;
89 ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z; 89 ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z;
@@ -96,7 +96,7 @@ namespace OpenSim.Data.NHibernate
96 96
97 public Type ReturnedType 97 public Type ReturnedType
98 { 98 {
99 get { return typeof(LLVector3); } 99 get { return typeof(Vector3); }
100 } 100 }
101 101
102 public SqlType[] SqlTypes 102 public SqlType[] SqlTypes
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 400451f..6ee527e 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -30,7 +30,7 @@ using System.Collections;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using NHibernate; 35using NHibernate;
36using NHibernate.Cfg; 36using NHibernate.Cfg;
@@ -101,7 +101,7 @@ namespace OpenSim.Data.NHibernate
101 101
102 } 102 }
103 103
104 override public AssetBase FetchAsset(LLUUID uuid) 104 override public AssetBase FetchAsset(UUID uuid)
105 { 105 {
106 try 106 try
107 { 107 {
@@ -163,13 +163,13 @@ namespace OpenSim.Data.NHibernate
163 // asset.InvType, temporary, local, assetLength)); 163 // asset.InvType, temporary, local, assetLength));
164 // } 164 // }
165 165
166 override public bool ExistsAsset(LLUUID uuid) 166 override public bool ExistsAsset(UUID uuid)
167 { 167 {
168 m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid); 168 m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid);
169 return (FetchAsset(uuid) != null); 169 return (FetchAsset(uuid) != null);
170 } 170 }
171 171
172 public void DeleteAsset(LLUUID uuid) 172 public void DeleteAsset(UUID uuid)
173 { 173 {
174 174
175 } 175 }
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 657a7b2..20dad1a 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using NHibernate; 35using NHibernate;
36using NHibernate.Cfg; 36using NHibernate.Cfg;
@@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate
105 /// </summary> 105 /// </summary>
106 /// <param name="item">The UUID of the item to be returned</param> 106 /// <param name="item">The UUID of the item to be returned</param>
107 /// <returns>A class containing item information</returns> 107 /// <returns>A class containing item information</returns>
108 public InventoryItemBase getInventoryItem(LLUUID item) 108 public InventoryItemBase getInventoryItem(UUID item)
109 { 109 {
110 try 110 try
111 { 111 {
@@ -163,7 +163,7 @@ namespace OpenSim.Data.NHibernate
163 /// 163 ///
164 /// </summary> 164 /// </summary>
165 /// <param name="item"></param> 165 /// <param name="item"></param>
166 public void deleteInventoryItem(LLUUID itemID) 166 public void deleteInventoryItem(UUID itemID)
167 { 167 {
168 using (ITransaction transaction = session.BeginTransaction()) 168 using (ITransaction transaction = session.BeginTransaction())
169 { 169 {
@@ -177,7 +177,7 @@ namespace OpenSim.Data.NHibernate
177 /// </summary> 177 /// </summary>
178 /// <param name="folder">The UUID of the folder to be returned</param> 178 /// <param name="folder">The UUID of the folder to be returned</param>
179 /// <returns>A class containing folder information</returns> 179 /// <returns>A class containing folder information</returns>
180 public InventoryFolderBase getInventoryFolder(LLUUID folder) 180 public InventoryFolderBase getInventoryFolder(UUID folder)
181 { 181 {
182 try 182 try
183 { 183 {
@@ -235,7 +235,7 @@ namespace OpenSim.Data.NHibernate
235 /// 235 ///
236 /// </summary> 236 /// </summary>
237 /// <param name="folder"></param> 237 /// <param name="folder"></param>
238 public void deleteInventoryFolder(LLUUID folderID) 238 public void deleteInventoryFolder(UUID folderID)
239 { 239 {
240 using (ITransaction transaction = session.BeginTransaction()) 240 using (ITransaction transaction = session.BeginTransaction())
241 { 241 {
@@ -245,12 +245,12 @@ namespace OpenSim.Data.NHibernate
245 } 245 }
246 246
247 // useful private methods 247 // useful private methods
248 private bool ExistsItem(LLUUID uuid) 248 private bool ExistsItem(UUID uuid)
249 { 249 {
250 return (getInventoryItem(uuid) != null) ? true : false; 250 return (getInventoryItem(uuid) != null) ? true : false;
251 } 251 }
252 252
253 private bool ExistsFolder(LLUUID uuid) 253 private bool ExistsFolder(UUID uuid)
254 { 254 {
255 return (getInventoryFolder(uuid) != null) ? true : false; 255 return (getInventoryFolder(uuid) != null) ? true : false;
256 } 256 }
@@ -314,7 +314,7 @@ namespace OpenSim.Data.NHibernate
314 /// </summary> 314 /// </summary>
315 /// <param name="folderID">The UUID of the target folder</param> 315 /// <param name="folderID">The UUID of the target folder</param>
316 /// <returns>A List of InventoryItemBase items</returns> 316 /// <returns>A List of InventoryItemBase items</returns>
317 public List<InventoryItemBase> getInventoryInFolder(LLUUID folderID) 317 public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
318 { 318 {
319 // try { 319 // try {
320 ICriteria criteria = session.CreateCriteria(typeof(InventoryItemBase)); 320 ICriteria criteria = session.CreateCriteria(typeof(InventoryItemBase));
@@ -332,16 +332,16 @@ namespace OpenSim.Data.NHibernate
332 // } 332 // }
333 } 333 }
334 334
335 public List<InventoryFolderBase> getUserRootFolders(LLUUID user) 335 public List<InventoryFolderBase> getUserRootFolders(UUID user)
336 { 336 {
337 return new List<InventoryFolderBase>(); 337 return new List<InventoryFolderBase>();
338 } 338 }
339 339
340 // see InventoryItemBase.getUserRootFolder 340 // see InventoryItemBase.getUserRootFolder
341 public InventoryFolderBase getUserRootFolder(LLUUID user) 341 public InventoryFolderBase getUserRootFolder(UUID user)
342 { 342 {
343 ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); 343 ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
344 criteria.Add(Expression.Eq("ParentID", LLUUID.Zero)); 344 criteria.Add(Expression.Eq("ParentID", UUID.Zero));
345 criteria.Add(Expression.Eq("Owner", user)); 345 criteria.Add(Expression.Eq("Owner", user));
346 foreach (InventoryFolderBase folder in criteria.List()) 346 foreach (InventoryFolderBase folder in criteria.List())
347 { 347 {
@@ -356,7 +356,7 @@ namespace OpenSim.Data.NHibernate
356 /// </summary> 356 /// </summary>
357 /// <param name="folders">list where folders will be appended</param> 357 /// <param name="folders">list where folders will be appended</param>
358 /// <param name="parentID">ID of parent</param> 358 /// <param name="parentID">ID of parent</param>
359 private void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID) 359 private void getInventoryFolders(ref List<InventoryFolderBase> folders, UUID parentID)
360 { 360 {
361 ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); 361 ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase));
362 criteria.Add(Expression.Eq("ParentID", parentID)); 362 criteria.Add(Expression.Eq("ParentID", parentID));
@@ -371,7 +371,7 @@ namespace OpenSim.Data.NHibernate
371 /// </summary> 371 /// </summary>
372 /// <param name="parentID">The folder to get subfolders for</param> 372 /// <param name="parentID">The folder to get subfolders for</param>
373 /// <returns>A list of inventory folders</returns> 373 /// <returns>A list of inventory folders</returns>
374 public List<InventoryFolderBase> getInventoryFolders(LLUUID parentID) 374 public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
375 { 375 {
376 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 376 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
377 getInventoryFolders(ref folders, parentID); 377 getInventoryFolders(ref folders, parentID);
@@ -379,7 +379,7 @@ namespace OpenSim.Data.NHibernate
379 } 379 }
380 380
381 // See IInventoryDataPlugin 381 // See IInventoryDataPlugin
382 public List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID) 382 public List<InventoryFolderBase> getFolderHierarchy(UUID parentID)
383 { 383 {
384 List<InventoryFolderBase> folders = new List<InventoryFolderBase>(); 384 List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
385 getInventoryFolders(ref folders, parentID); 385 getInventoryFolders(ref folders, parentID);
diff --git a/OpenSim/Data/NHibernate/NHibernateRegionData.cs b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
index 9682d87..07bf05c 100644
--- a/OpenSim/Data/NHibernate/NHibernateRegionData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateRegionData.cs
@@ -31,7 +31,7 @@ using System.Collections.Generic;
31using System.IO; 31using System.IO;
32using System.Reflection; 32using System.Reflection;
33using System.Text.RegularExpressions; 33using System.Text.RegularExpressions;
34using libsecondlife; 34using OpenMetaverse;
35using log4net; 35using log4net;
36using NHibernate; 36using NHibernate;
37using NHibernate.Cfg; 37using NHibernate.Cfg;
@@ -109,7 +109,7 @@ namespace OpenSim.Data.NHibernate
109 { 109 {
110 } 110 }
111 111
112 public RegionSettings LoadRegionSettings(LLUUID regionUUID) 112 public RegionSettings LoadRegionSettings(UUID regionUUID)
113 { 113 {
114 return null; 114 return null;
115 } 115 }
@@ -162,7 +162,7 @@ namespace OpenSim.Data.NHibernate
162 /// </summary> 162 /// </summary>
163 /// <param name="obj">the object</param> 163 /// <param name="obj">the object</param>
164 /// <param name="regionUUID">the region UUID</param> 164 /// <param name="regionUUID">the region UUID</param>
165 public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) 165 public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
166 { 166 {
167 try 167 try
168 { 168 {
@@ -179,7 +179,7 @@ namespace OpenSim.Data.NHibernate
179 } 179 }
180 } 180 }
181 181
182 private SceneObjectGroup LoadObject(LLUUID uuid, LLUUID region) 182 private SceneObjectGroup LoadObject(UUID uuid, UUID region)
183 { 183 {
184 SceneObjectGroup group = new SceneObjectGroup(); 184 SceneObjectGroup group = new SceneObjectGroup();
185 185
@@ -210,7 +210,7 @@ namespace OpenSim.Data.NHibernate
210 /// </summary> 210 /// </summary>
211 /// <param name="obj">the object</param> 211 /// <param name="obj">the object</param>
212 /// <param name="regionUUID">the region UUID</param> 212 /// <param name="regionUUID">the region UUID</param>
213 public void RemoveObject(LLUUID obj, LLUUID regionUUID) 213 public void RemoveObject(UUID obj, UUID regionUUID)
214 { 214 {
215 SceneObjectGroup g = LoadObject(obj, regionUUID); 215 SceneObjectGroup g = LoadObject(obj, regionUUID);
216 foreach (SceneObjectPart p in g.Children.Values) 216 foreach (SceneObjectPart p in g.Children.Values)
@@ -219,7 +219,7 @@ namespace OpenSim.Data.NHibernate
219 } 219 }
220 session.Flush(); 220 session.Flush();
221 221
222 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); 222 m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID);
223 223
224 } 224 }
225 225
@@ -228,9 +228,9 @@ namespace OpenSim.Data.NHibernate
228 /// </summary> 228 /// </summary>
229 /// <param name="regionUUID">The region UUID</param> 229 /// <param name="regionUUID">The region UUID</param>
230 /// <returns>List of loaded groups</returns> 230 /// <returns>List of loaded groups</returns>
231 public List<SceneObjectGroup> LoadObjects(LLUUID regionUUID) 231 public List<SceneObjectGroup> LoadObjects(UUID regionUUID)
232 { 232 {
233 Dictionary<LLUUID, SceneObjectGroup> SOG = new Dictionary<LLUUID, SceneObjectGroup>(); 233 Dictionary<UUID, SceneObjectGroup> SOG = new Dictionary<UUID, SceneObjectGroup>();
234 List<SceneObjectGroup> ret = new List<SceneObjectGroup>(); 234 List<SceneObjectGroup> ret = new List<SceneObjectGroup>();
235 235
236 ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart)); 236 ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart));
@@ -276,7 +276,7 @@ namespace OpenSim.Data.NHibernate
276 /// </summary> 276 /// </summary>
277 /// <param name="ter">terrain heightfield</param> 277 /// <param name="ter">terrain heightfield</param>
278 /// <param name="regionID">region UUID</param> 278 /// <param name="regionID">region UUID</param>
279 public void StoreTerrain(double[,] ter, LLUUID regionID) 279 public void StoreTerrain(double[,] ter, UUID regionID)
280 { 280 {
281 lock (this) { 281 lock (this) {
282 Terrain t = new Terrain(regionID, ter); 282 Terrain t = new Terrain(regionID, ter);
@@ -289,7 +289,7 @@ namespace OpenSim.Data.NHibernate
289 /// </summary> 289 /// </summary>
290 /// <param name="regionID">the region UUID</param> 290 /// <param name="regionID">the region UUID</param>
291 /// <returns>Heightfield data</returns> 291 /// <returns>Heightfield data</returns>
292 public double[,] LoadTerrain(LLUUID regionID) 292 public double[,] LoadTerrain(UUID regionID)
293 { 293 {
294 try 294 try
295 { 295 {
@@ -307,7 +307,7 @@ namespace OpenSim.Data.NHibernate
307 /// 307 ///
308 /// </summary> 308 /// </summary>
309 /// <param name="globalID"></param> 309 /// <param name="globalID"></param>
310 public void RemoveLandObject(LLUUID globalID) 310 public void RemoveLandObject(UUID globalID)
311 { 311 {
312 312
313 } 313 }
@@ -326,7 +326,7 @@ namespace OpenSim.Data.NHibernate
326 /// </summary> 326 /// </summary>
327 /// <param name="regionUUID"></param> 327 /// <param name="regionUUID"></param>
328 /// <returns></returns> 328 /// <returns></returns>
329 public List<LandData> LoadLandObjects(LLUUID regionUUID) 329 public List<LandData> LoadLandObjects(UUID regionUUID)
330 { 330 {
331 List<LandData> landDataForRegion = new List<LandData>(); 331 List<LandData> landDataForRegion = new List<LandData>();
332 332
@@ -347,7 +347,7 @@ namespace OpenSim.Data.NHibernate
347 /// </summary> 347 /// </summary>
348 /// <param name="regionUUID">the region UUID</param> 348 /// <param name="regionUUID">the region UUID</param>
349 /// <returns>The banlist</returns> 349 /// <returns>The banlist</returns>
350 public List<EstateBan> LoadRegionBanList(LLUUID regionUUID) 350 public List<EstateBan> LoadRegionBanList(UUID regionUUID)
351 { 351 {
352 List<EstateBan> regionbanlist = new List<EstateBan>(); 352 List<EstateBan> regionbanlist = new List<EstateBan>();
353 353
@@ -395,7 +395,7 @@ namespace OpenSim.Data.NHibernate
395 /// </summary> 395 /// </summary>
396 /// <param name="primID"></param> 396 /// <param name="primID"></param>
397 /// <param name="items"></param> 397 /// <param name="items"></param>
398 public void StorePrimInventory(LLUUID primID, ICollection<TaskInventoryItem> items) 398 public void StorePrimInventory(UUID primID, ICollection<TaskInventoryItem> items)
399 { 399 {
400 ICriteria criteria = session.CreateCriteria(typeof(TaskInventoryItem)); 400 ICriteria criteria = session.CreateCriteria(typeof(TaskInventoryItem));
401 criteria.Add(Expression.Eq("ParentPartID", primID)); 401 criteria.Add(Expression.Eq("ParentPartID", primID));
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 8435762..459b8e7 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -30,7 +30,7 @@ using System.Collections.Generic;
30using System.IO; 30using System.IO;
31using System.Reflection; 31using System.Reflection;
32using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
33using libsecondlife; 33using OpenMetaverse;
34using log4net; 34using log4net;
35using NHibernate; 35using NHibernate;
36using NHibernate.Cfg; 36using NHibernate.Cfg;
@@ -90,7 +90,7 @@ namespace OpenSim.Data.NHibernate
90 m.Update(); 90 m.Update();
91 } 91 }
92 92
93 private bool ExistsUser(LLUUID uuid) 93 private bool ExistsUser(UUID uuid)
94 { 94 {
95 UserProfileData user = null; 95 UserProfileData user = null;
96 try 96 try
@@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate
105 return (user != null); 105 return (user != null);
106 } 106 }
107 107
108 override public UserProfileData GetUserByUUID(LLUUID uuid) 108 override public UserProfileData GetUserByUUID(UUID uuid)
109 { 109 {
110 UserProfileData user; 110 UserProfileData user;
111 // TODO: I'm sure I'll have to do something silly here 111 // TODO: I'm sure I'll have to do something silly here
@@ -136,7 +136,7 @@ namespace OpenSim.Data.NHibernate
136 } 136 }
137 } 137 }
138 138
139 private void SetAgentData(LLUUID uuid, UserAgentData agent) 139 private void SetAgentData(UUID uuid, UserAgentData agent)
140 { 140 {
141 if (agent == null) 141 if (agent == null)
142 { 142 {
@@ -190,7 +190,7 @@ namespace OpenSim.Data.NHibernate
190 session.Update(agent); 190 session.Update(agent);
191 } 191 }
192 192
193 override public UserAgentData GetAgentByUUID(LLUUID uuid) 193 override public UserAgentData GetAgentByUUID(UUID uuid)
194 { 194 {
195 try 195 try
196 { 196 {
@@ -225,7 +225,7 @@ namespace OpenSim.Data.NHibernate
225 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]); 225 return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]);
226 } 226 }
227 227
228 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 228 override public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query)
229 { 229 {
230 List<AvatarPickerAvatar> results = new List<AvatarPickerAvatar>(); 230 List<AvatarPickerAvatar> results = new List<AvatarPickerAvatar>();
231 string[] querysplit; 231 string[] querysplit;
@@ -249,18 +249,18 @@ namespace OpenSim.Data.NHibernate
249 } 249 }
250 250
251 // TODO: actually implement these 251 // TODO: actually implement these
252 public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) { return; } 252 public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { return; }
253 public override void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) { return; } 253 public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) { return; }
254 public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) { return; } 254 public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { return; }
255 public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) { return; } 255 public override void RemoveUserFriend(UUID friendlistowner, UUID friend) { return; }
256 public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) { return; } 256 public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) { return; }
257 public override List<FriendListItem> GetUserFriendList(LLUUID friendlistowner) { return new List<FriendListItem>(); } 257 public override List<FriendListItem> GetUserFriendList(UUID friendlistowner) { return new List<FriendListItem>(); }
258 public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) { return true; } 258 public override bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return true; }
259 public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory) { return true; } 259 public override bool InventoryTransferRequest(UUID from, UUID to, UUID inventory) { return true; }
260 260
261 /// Appearance 261 /// Appearance
262 /// TODO: stubs for now to get us to a compiling state gently 262 /// TODO: stubs for now to get us to a compiling state gently
263 public override AvatarAppearance GetUserAppearance(LLUUID user) 263 public override AvatarAppearance GetUserAppearance(UUID user)
264 { 264 {
265 AvatarAppearance appearance; 265 AvatarAppearance appearance;
266 // TODO: I'm sure I'll have to do something silly here 266 // TODO: I'm sure I'll have to do something silly here
@@ -272,7 +272,7 @@ namespace OpenSim.Data.NHibernate
272 return appearance; 272 return appearance;
273 } 273 }
274 274
275 private bool ExistsAppearance(LLUUID uuid) 275 private bool ExistsAppearance(UUID uuid)
276 { 276 {
277 AvatarAppearance appearance; 277 AvatarAppearance appearance;
278 try { 278 try {
@@ -285,7 +285,7 @@ namespace OpenSim.Data.NHibernate
285 } 285 }
286 286
287 287
288 public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 288 public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance)
289 { 289 {
290 if (appearance == null) 290 if (appearance == null)
291 return; 291 return;
@@ -303,7 +303,7 @@ namespace OpenSim.Data.NHibernate
303 } 303 }
304 } 304 }
305 305
306 public override void ResetAttachments(LLUUID userID) 306 public override void ResetAttachments(UUID userID)
307 { 307 {
308 } 308 }
309 309
diff --git a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
index f6b648a..7c3d8cf 100644
--- a/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/AssetBase.hbm.xml
@@ -1,7 +1,7 @@
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.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false"> 3 <class name="OpenSim.Framework.AssetBase, OpenSim.Framework" table="Assets" lazy="false">
4 <id name="FullID" column="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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="System.SByte" />
@@ -11,4 +11,4 @@
11 <property name="Temporary" type="boolean" /> 11 <property name="Temporary" type="boolean" />
12 <property name="Data" type="binary" /> 12 <property name="Data" type="binary" />
13 </class> 13 </class>
14</hibernate-mapping> \ No newline at end of file 14</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
index 6d918fe..6afe9fa 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryFolderBase.hbm.xml
@@ -1,13 +1,13 @@
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.Framework.InventoryFolderBase, OpenSim.Framework" table="InventoryFolders" lazy="false"> 3 <class name="OpenSim.Framework.InventoryFolderBase, OpenSim.Framework" table="InventoryFolders" lazy="false">
4 <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="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="Int16" /> 7 <property name="Type" type="Int16" />
8 <property name="Version" type="System.UInt16" /> 8 <property name="Version" type="System.UInt16" />
9 <property name="ParentID" index="folder_parent_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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.LLUUIDUserType, 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" />
12 </class> 12 </class>
13</hibernate-mapping> \ No newline at end of file 13</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
index f1b4007..9a4d7ca 100644
--- a/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/InventoryItemBase.hbm.xml
@@ -1,26 +1,26 @@
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.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="false"> 3 <class name="OpenSim.Framework.InventoryItemBase, OpenSim.Framework" table="InventoryItems" lazy="false">
4 <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="InvType" type="System.Int32" /> 7 <property name="InvType" type="System.Int32" />
8 <property name="AssetType" type="System.Int32" /> 8 <property name="AssetType" type="System.Int32" />
9 <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 9 <property name="AssetID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
10 <property name="Folder" index="item_folder_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 10 <property name="Folder" index="item_folder_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
11 <property name="Owner" index="item_owner_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 11 <property name="Owner" index="item_owner_id" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
12 <property name="Creator" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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="System.UInt32" />
16 <property name="CurrentPermissions" type="System.UInt32" /> 16 <property name="CurrentPermissions" type="System.UInt32" />
17 <property name="BasePermissions" type="System.UInt32" /> 17 <property name="BasePermissions" type="System.UInt32" />
18 <property name="EveryOnePermissions" type="System.UInt32" /> 18 <property name="EveryOnePermissions" type="System.UInt32" />
19 <property name="GroupID" index="item_group_id" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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="System.UInt32" />
24 <property name="CreationDate" type="System.Int32" /> 24 <property name="CreationDate" type="System.Int32" />
25 </class> 25 </class>
26</hibernate-mapping> \ No newline at end of file 26</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
index ef3ab9b..fe055bb 100644
--- a/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/RegionStore.hbm.xml
@@ -1,12 +1,12 @@
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.Scenes.SceneObjectPart, OpenSim.Region.Environment" table="Prims" lazy="false"> 3 <class name="OpenSim.Region.Environment.Scenes.SceneObjectPart, OpenSim.Region.Environment" table="Prims" lazy="false">
4 <id name="UUID" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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="System.UInt32"/>
8 <property name="ParentUUID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 8 <property name="ParentUUID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
9 <property name="RegionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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" />
11 <property name="Name" type="String" length="255" /> 11 <property name="Name" type="String" length="255" />
12 <property name="Text" type="String" length="255" /> 12 <property name="Text" type="String" length="255" />
@@ -15,10 +15,10 @@
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="System.UInt32" />
18 <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 18 <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
19 <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 19 <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
20 <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 20 <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
21 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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="System.UInt32" />
24 <property name="NextOwnerMask" type="System.UInt32" /> 24 <property name="NextOwnerMask" type="System.UInt32" />
@@ -26,50 +26,50 @@
26 <property name="EveryoneMask" type="System.UInt32" /> 26 <property name="EveryoneMask" type="System.UInt32" />
27 <property name="BaseMask" type="System.UInt32" /> 27 <property name="BaseMask" type="System.UInt32" />
28 28
29 <property name="OffsetPosition" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 29 <property name="OffsetPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
30 <column name="PositionX" /> 30 <column name="PositionX" />
31 <column name="PositionY" /> 31 <column name="PositionY" />
32 <column name="PositionZ" /> 32 <column name="PositionZ" />
33 </property> 33 </property>
34 34
35 <property name="GroupPosition" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 35 <property name="GroupPosition" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
36 <column name="GroupPositionX" /> 36 <column name="GroupPositionX" />
37 <column name="GroupPositionY" /> 37 <column name="GroupPositionY" />
38 <column name="GroupPositionZ" /> 38 <column name="GroupPositionZ" />
39 </property> 39 </property>
40 40
41 <property name="Velocity" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 41 <property name="Velocity" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
42 <column name="VelocityX" /> 42 <column name="VelocityX" />
43 <column name="VelocityY" /> 43 <column name="VelocityY" />
44 <column name="VelocityZ" /> 44 <column name="VelocityZ" />
45 </property> 45 </property>
46 46
47 <property name="AngularVelocity" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 47 <property name="AngularVelocity" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
48 <column name="AngularVelocityX" /> 48 <column name="AngularVelocityX" />
49 <column name="AngularVelocityY" /> 49 <column name="AngularVelocityY" />
50 <column name="AngularVelocityZ" /> 50 <column name="AngularVelocityZ" />
51 </property> 51 </property>
52 52
53 <property name="Acceleration" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 53 <property name="Acceleration" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
54 <column name="AccelerationX" /> 54 <column name="AccelerationX" />
55 <column name="AccelerationY" /> 55 <column name="AccelerationY" />
56 <column name="AccelerationZ" /> 56 <column name="AccelerationZ" />
57 </property> 57 </property>
58 58
59 <property name="SitTargetPositionLL" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 59 <property name="SitTargetPositionLL" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
60 <column name="SitTargetOffsetX" /> 60 <column name="SitTargetOffsetX" />
61 <column name="SitTargetOffsetY" /> 61 <column name="SitTargetOffsetY" />
62 <column name="SitTargetOffsetZ" /> 62 <column name="SitTargetOffsetZ" />
63 </property> 63 </property>
64 64
65 <property name="RotationOffset" type="OpenSim.Data.NHibernate.LLQuaternionUserType, OpenSim.Data.NHibernate" > 65 <property name="RotationOffset" type="OpenSim.Data.NHibernate.QuaternionUserType, OpenSim.Data.NHibernate" >
66 <column name="RotationX" /> 66 <column name="RotationX" />
67 <column name="RotationY" /> 67 <column name="RotationY" />
68 <column name="RotationZ" /> 68 <column name="RotationZ" />
69 <column name="RotationW" /> 69 <column name="RotationW" />
70 </property> 70 </property>
71 71
72 <property name="SitTargetOrientationLL" type="OpenSim.Data.NHibernate.LLQuaternionUserType, OpenSim.Data.NHibernate" > 72 <property name="SitTargetOrientationLL" type="OpenSim.Data.NHibernate.QuaternionUserType, OpenSim.Data.NHibernate" >
73 <column name="SitTargetOrientX" /> 73 <column name="SitTargetOrientX" />
74 <column name="SitTargetOrientY" /> 74 <column name="SitTargetOrientY" />
75 <column name="SitTargetOrientZ" /> 75 <column name="SitTargetOrientZ" />
@@ -77,7 +77,7 @@
77 </property> 77 </property>
78 78
79 <component name="Shape"> 79 <component name="Shape">
80 <property name="Scale" type="OpenSim.Data.NHibernate.LLVector3UserType, OpenSim.Data.NHibernate" > 80 <property name="Scale" type="OpenSim.Data.NHibernate.Vector3UserType, OpenSim.Data.NHibernate" >
81 <column name="ScaleX" /> 81 <column name="ScaleX" />
82 <column name="ScaleY" /> 82 <column name="ScaleY" />
83 <column name="ScaleZ" /> 83 <column name="ScaleZ" />
@@ -105,22 +105,22 @@
105 </component> 105 </component>
106 </class> 106 </class>
107 <class name="OpenSim.Data.NHibernate.Terrain, OpenSim.Data.NHibernate" table="Terrain" lazy="false"> 107 <class name="OpenSim.Data.NHibernate.Terrain, OpenSim.Data.NHibernate" table="Terrain" lazy="false">
108 <id name="RegionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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="Map" type="System.Byte[]" />
112 </class> 112 </class>
113 <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false"> 113 <class name="OpenSim.Framework.TaskInventoryItem, OpenSim.Framework" table="PrimItems" lazy="false">
114 <id name="ItemID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 114 <id name="ItemID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
115 <generator class="assigned" /> 115 <generator class="assigned" />
116 </id> 116 </id>
117 <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 117 <property name="ParentPartID" column="PrimID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
118 <property name="AssetID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 118 <property name="AssetID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
119 <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 119 <property name="ParentID" column="ParentFolderID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
120 <property name="CreatorID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 120 <property name="CreatorID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
121 <property name="OwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 121 <property name="OwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
122 <property name="GroupID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 122 <property name="GroupID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
123 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"/> 123 <property name="LastOwnerID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate"/>
124 <property name="CurrentPermissions" type="System.UInt32" /> 124 <property name="CurrentPermissions" type="System.UInt32" />
125 <property name="BasePermissions" type="System.UInt32" /> 125 <property name="BasePermissions" type="System.UInt32" />
126 <property name="EveryonePermissions" type="System.UInt32" /> 126 <property name="EveryonePermissions" type="System.UInt32" />
@@ -132,4 +132,4 @@
132 <property name="Flags" type="System.UInt32" /> 132 <property name="Flags" type="System.UInt32" />
133 <property name="InvType" type="System.Int32" /> 133 <property name="InvType" type="System.Int32" />
134 </class> 134 </class>
135</hibernate-mapping> \ No newline at end of file 135</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
index 718cb98..0beddaf 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAgentData.hbm.xml
@@ -1,16 +1,16 @@
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.Framework.UserAgentData, OpenSim.Framework" table="UserAgents" lazy="false"> 3 <class name="OpenSim.Framework.UserAgentData, OpenSim.Framework" table="UserAgents" lazy="false">
4 <id name="ProfileID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="ProfileID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
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="Int32" />
9 <property name="AgentOnline" type="boolean" /> 9 <property name="AgentOnline" type="boolean" />
10 <property name="SessionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 10 <property name="SessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
11 <property name="SecureSessionID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 11 <property name="SecureSessionID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
12 <property name="InitialRegion" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 12 <property name="InitialRegion" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
13 <property name="Region" type="OpenSim.Data.NHibernate.LLUUIDUserType, 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="Int64" />
@@ -18,4 +18,4 @@
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> \ No newline at end of file 21</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
index 06e9c1a..b633c34 100644
--- a/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserAppearance.hbm.xml
@@ -1,37 +1,37 @@
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.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="false"> 3 <class name="OpenSim.Framework.AvatarAppearance, OpenSim.Framework" table="UserAppearances" lazy="false">
4 <id name="Owner" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="Owner" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="BodyItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 7 <property name="BodyItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
8 <property name="BodyAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 8 <property name="BodyAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
9 <property name="SkinItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 9 <property name="SkinItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
10 <property name="SkinAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 10 <property name="SkinAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
11 <property name="HairItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 11 <property name="HairItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
12 <property name="HairAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 12 <property name="HairAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
13 <property name="EyesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 13 <property name="EyesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
14 <property name="EyesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 14 <property name="EyesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
15 <property name="ShirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 15 <property name="ShirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
16 <property name="ShirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 16 <property name="ShirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
17 <property name="PantsItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 17 <property name="PantsItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
18 <property name="PantsAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 18 <property name="PantsAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
19 <property name="ShoesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 19 <property name="ShoesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
20 <property name="ShoesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 20 <property name="ShoesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
21 <property name="SocksItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 21 <property name="SocksItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
22 <property name="SocksAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 22 <property name="SocksAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
23 <property name="JacketItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 23 <property name="JacketItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
24 <property name="JacketAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 24 <property name="JacketAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
25 <property name="GlovesItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 25 <property name="GlovesItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
26 <property name="GlovesAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 26 <property name="GlovesAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
27 <property name="UnderShirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 27 <property name="UnderShirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
28 <property name="UnderShirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 28 <property name="UnderShirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
29 <property name="UnderPantsItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 29 <property name="UnderPantsItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
30 <property name="UnderPantsAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 30 <property name="UnderPantsAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
31 <property name="SkirtItem" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 31 <property name="SkirtItem" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
32 <property name="SkirtAsset" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 32 <property name="SkirtAsset" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
33 <property name="Texture" type="OpenSim.Data.NHibernate.TextureUserType, OpenSim.Data.NHibernate" /> 33 <property name="Texture" type="OpenSim.Data.NHibernate.TextureUserType, OpenSim.Data.NHibernate" />
34 <property name="VisualParams" type="binary" /> 34 <property name="VisualParams" type="binary" />
35 <property name="Serial" type="Int32" /> 35 <property name="Serial" type="Int32" />
36 </class> 36 </class>
37</hibernate-mapping> \ No newline at end of file 37</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
index 4003628..873930b 100644
--- a/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
+++ b/OpenSim/Data/NHibernate/Resources/UserProfileData.hbm.xml
@@ -1,14 +1,14 @@
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.Framework.UserProfileData, OpenSim.Framework" table="UserProfiles" lazy="false"> 3 <class name="OpenSim.Framework.UserProfileData, OpenSim.Framework" table="UserProfiles" lazy="false">
4 <id name="ID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate"> 4 <id name="ID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate">
5 <generator class="assigned" /> 5 <generator class="assigned" />
6 </id> 6 </id>
7 <property name="FirstName" index="user_firstname" type="String" length="32" /> 7 <property name="FirstName" index="user_firstname" type="String" length="32" />
8 <property name="SurName" index="user_surname" type="String" length="32" /> 8 <property name="SurName" index="user_surname" type="String" length="32" />
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.LLUUIDUserType, 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="System.UInt32" />
13 <property name="HomeRegionY" type="System.UInt32" /> 13 <property name="HomeRegionY" type="System.UInt32" />
14 <property name="HomeLocationX" type="Single" /> 14 <property name="HomeLocationX" type="Single" />
@@ -19,12 +19,12 @@
19 <property name="HomeLookAtZ" type="Single" /> 19 <property name="HomeLookAtZ" type="Single" />
20 <property name="Created" type="Int32" /> 20 <property name="Created" type="Int32" />
21 <property name="LastLogin" type="Int32" /> 21 <property name="LastLogin" type="Int32" />
22 <property name="RootInventoryFolderID" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 22 <property name="RootInventoryFolderID" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
23 <property name="UserInventoryURI" type="String" length="255"/> 23 <property name="UserInventoryURI" type="String" length="255"/>
24 <property name="UserAssetURI" type="String" length="255"/> 24 <property name="UserAssetURI" type="String" length="255"/>
25 <property name="Image" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 25 <property name="Image" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
26 <property name="FirstLifeImage" type="OpenSim.Data.NHibernate.LLUUIDUserType, OpenSim.Data.NHibernate" /> 26 <property name="FirstLifeImage" type="OpenSim.Data.NHibernate.UUIDUserType, OpenSim.Data.NHibernate" />
27 <property name="AboutText" type="String" length="255" /> 27 <property name="AboutText" type="String" length="255" />
28 <property name="FirstLifeAboutText" type="String" length="255" /> 28 <property name="FirstLifeAboutText" type="String" length="255" />
29 </class> 29 </class>
30</hibernate-mapping> \ No newline at end of file 30</hibernate-mapping>
diff --git a/OpenSim/Data/NHibernate/Terrain.cs b/OpenSim/Data/NHibernate/Terrain.cs
index 608f03e..dd0da44 100644
--- a/OpenSim/Data/NHibernate/Terrain.cs
+++ b/OpenSim/Data/NHibernate/Terrain.cs
@@ -30,7 +30,7 @@ using System.IO;
30using System.Reflection; 30using System.Reflection;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using log4net; 32using log4net;
33using libsecondlife; 33using OpenMetaverse;
34 34
35namespace OpenSim.Data.NHibernate 35namespace OpenSim.Data.NHibernate
36{ 36{
@@ -39,9 +39,9 @@ namespace OpenSim.Data.NHibernate
39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
40 40
41 private double[,] map; 41 private double[,] map;
42 private LLUUID regionID; 42 private UUID regionID;
43 43
44 public Terrain(LLUUID Region, double[,] array) 44 public Terrain(UUID Region, double[,] array)
45 { 45 {
46 map = array; 46 map = array;
47 regionID = Region; 47 regionID = Region;
@@ -51,10 +51,10 @@ namespace OpenSim.Data.NHibernate
51 { 51 {
52 map = new double[Constants.RegionSize, Constants.RegionSize]; 52 map = new double[Constants.RegionSize, Constants.RegionSize];
53 map.Initialize(); 53 map.Initialize();
54 regionID = LLUUID.Zero; 54 regionID = UUID.Zero;
55 } 55 }
56 56
57 public LLUUID RegionID 57 public UUID RegionID
58 { 58 {
59 get { return regionID; } 59 get { return regionID; }
60 set { regionID = value; } 60 set { regionID = value; }
diff --git a/OpenSim/Data/NHibernate/TextureUserType.cs b/OpenSim/Data/NHibernate/TextureUserType.cs
index f8aa704..ff949d4 100644
--- a/OpenSim/Data/NHibernate/TextureUserType.cs
+++ b/OpenSim/Data/NHibernate/TextureUserType.cs
@@ -27,7 +27,7 @@
27 27
28using System; 28using System;
29using System.Data; 29using System.Data;
30using libsecondlife; 30using OpenMetaverse;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using NHibernate; 32using NHibernate;
33using NHibernate.SqlTypes; 33using NHibernate.SqlTypes;
@@ -53,12 +53,12 @@ namespace OpenSim.Data.NHibernate
53 if (texture == null) 53 if (texture == null)
54 { 54 {
55 // TODO: should parametrize this texture out 55 // TODO: should parametrize this texture out
56 return new LLObject.TextureEntry(new LLUUID(Constants.DefaultTexture)); 56 return new Primitive.TextureEntry(new UUID(Constants.DefaultTexture));
57 } 57 }
58 else 58 else
59 { 59 {
60 byte[] bytes = ((LLObject.TextureEntry)texture).ToBytes(); 60 byte[] bytes = ((Primitive.TextureEntry)texture).ToBytes();
61 return new LLObject.TextureEntry(bytes, 0, bytes.Length); 61 return new Primitive.TextureEntry(bytes, 0, bytes.Length);
62 } 62 }
63 } 63 }
64 64
@@ -85,7 +85,7 @@ namespace OpenSim.Data.NHibernate
85 if (!rs.IsDBNull(ord)) 85 if (!rs.IsDBNull(ord))
86 { 86 {
87 byte[] bytes = (byte[])rs[ord]; 87 byte[] bytes = (byte[])rs[ord];
88 texture = new LLObject.TextureEntry(bytes, 0, bytes.Length); 88 texture = new Primitive.TextureEntry(bytes, 0, bytes.Length);
89 } 89 }
90 90
91 return texture; 91 return texture;
@@ -93,7 +93,7 @@ namespace OpenSim.Data.NHibernate
93 93
94 public void NullSafeSet(IDbCommand cmd, object obj, int index) 94 public void NullSafeSet(IDbCommand cmd, object obj, int index)
95 { 95 {
96 LLObject.TextureEntry texture = (LLObject.TextureEntry)obj; 96 Primitive.TextureEntry texture = (Primitive.TextureEntry)obj;
97 ((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes(); 97 ((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes();
98 } 98 }
99 99
@@ -104,7 +104,7 @@ namespace OpenSim.Data.NHibernate
104 104
105 public Type ReturnedType 105 public Type ReturnedType
106 { 106 {
107 get { return typeof(LLObject.TextureEntry); } 107 get { return typeof(Primitive.TextureEntry); }
108 } 108 }
109 109
110 public SqlType[] SqlTypes 110 public SqlType[] SqlTypes
generated by cgit v1.1 at 2024-12-13 16:51:16 +0000