From 7d89e122930be39e84a6d174548fa2d12ac0484a Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Sat, 6 Sep 2008 07:52:41 +0000 Subject: * This is the fabled LibOMV update with all of the libOMV types from JHurliman * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke. --- OpenSim/Data/NHibernate/LLQuaternionUserType.cs | 15 +++--- OpenSim/Data/NHibernate/LLUUIDUserType.cs | 10 ++-- OpenSim/Data/NHibernate/LLVector3UserType.cs | 12 ++--- OpenSim/Data/NHibernate/NHibernateAssetData.cs | 8 ++-- OpenSim/Data/NHibernate/NHibernateInventoryData.cs | 28 +++++------ OpenSim/Data/NHibernate/NHibernateRegionData.cs | 28 +++++------ OpenSim/Data/NHibernate/NHibernateUserData.cs | 36 +++++++------- .../Data/NHibernate/Resources/AssetBase.hbm.xml | 4 +- .../Resources/InventoryFolderBase.hbm.xml | 8 ++-- .../NHibernate/Resources/InventoryItemBase.hbm.xml | 14 +++--- .../Data/NHibernate/Resources/RegionStore.hbm.xml | 52 ++++++++++---------- .../NHibernate/Resources/UserAgentData.hbm.xml | 12 ++--- .../NHibernate/Resources/UserAppearance.hbm.xml | 56 +++++++++++----------- .../NHibernate/Resources/UserProfileData.hbm.xml | 12 ++--- OpenSim/Data/NHibernate/Terrain.cs | 10 ++-- OpenSim/Data/NHibernate/TextureUserType.cs | 14 +++--- 16 files changed, 159 insertions(+), 160 deletions(-) (limited to 'OpenSim/Data/NHibernate') 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 @@ using System; using System.Data; -using libsecondlife; +using OpenMetaverse; using NHibernate; using NHibernate.SqlTypes; using NHibernate.UserTypes; @@ -35,7 +35,7 @@ using NHibernate.UserTypes; namespace OpenSim.Data.NHibernate { [Serializable] - public class LLQuaternionUserType: IUserType + public class QuaternionUserType: IUserType { public object Assemble(object cached, object owner) { @@ -49,9 +49,8 @@ namespace OpenSim.Data.NHibernate public object DeepCopy(object quat) { - // silly libsecondlife having no copy constructor - LLQuaternion q = (LLQuaternion) quat; - return new LLQuaternion(q.X, q.Y, q.Z, q.W); + Quaternion q = (Quaternion)quat; + return new Quaternion(q); } public object Disassemble(object quat) @@ -79,14 +78,14 @@ namespace OpenSim.Data.NHibernate int w = rs.GetOrdinal(names[3]); if (!rs.IsDBNull(x)) { - quat = new LLQuaternion((Single)rs[x], (Single)rs[y], (Single)rs[z], (Single)rs[w]); + quat = new Quaternion((Single)rs[x], (Single)rs[y], (Single)rs[z], (Single)rs[w]); } return quat; } public void NullSafeSet(IDbCommand cmd, object obj, int index) { - LLQuaternion quat = (LLQuaternion)obj; + Quaternion quat = (Quaternion)obj; ((IDataParameter)cmd.Parameters[index]).Value = quat.X; ((IDataParameter)cmd.Parameters[index + 1]).Value = quat.Y; ((IDataParameter)cmd.Parameters[index + 2]).Value = quat.Z; @@ -100,7 +99,7 @@ namespace OpenSim.Data.NHibernate public Type ReturnedType { - get { return typeof(LLQuaternion); } + get { return typeof(Quaternion); } } 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 @@ using System; using System.Data; -using libsecondlife; +using OpenMetaverse; using NHibernate; using NHibernate.SqlTypes; using NHibernate.UserTypes; @@ -35,7 +35,7 @@ using NHibernate.UserTypes; namespace OpenSim.Data.NHibernate { [Serializable] - public class LLUUIDUserType: IUserType + public class UUIDUserType: IUserType { public object Assemble(object cached, object owner) { @@ -75,7 +75,7 @@ namespace OpenSim.Data.NHibernate if (!rs.IsDBNull(ord)) { string first = (string)rs.GetString(ord); - uuid = new LLUUID(first); + uuid = new UUID(first); } return uuid; @@ -83,7 +83,7 @@ namespace OpenSim.Data.NHibernate public void NullSafeSet(IDbCommand cmd, object obj, int index) { - LLUUID uuid = (LLUUID)obj; + UUID uuid = (UUID)obj; ((IDataParameter)cmd.Parameters[index]).Value = uuid.ToString(); } @@ -94,7 +94,7 @@ namespace OpenSim.Data.NHibernate public Type ReturnedType { - get { return typeof(LLUUID); } + get { return typeof(UUID); } } 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 @@ using System; using System.Data; -using libsecondlife; +using OpenMetaverse; using NHibernate; using NHibernate.SqlTypes; using NHibernate.UserTypes; @@ -35,7 +35,7 @@ using NHibernate.UserTypes; namespace OpenSim.Data.NHibernate { [Serializable] - public class LLVector3UserType: IUserType + public class Vector3UserType: IUserType { public object Assemble(object cached, object owner) { @@ -49,7 +49,7 @@ namespace OpenSim.Data.NHibernate public object DeepCopy(object vector) { - return new LLVector3((LLVector3) vector); + return new Vector3((Vector3) vector); } public object Disassemble(object vector) @@ -76,14 +76,14 @@ namespace OpenSim.Data.NHibernate int z = rs.GetOrdinal(names[2]); if (!rs.IsDBNull(x)) { - vector = new LLVector3((Single)rs[x], (Single)rs[y], (Single)rs[z]); + vector = new Vector3((Single)rs[x], (Single)rs[y], (Single)rs[z]); } return vector; } public void NullSafeSet(IDbCommand cmd, object obj, int index) { - LLVector3 vector = (LLVector3)obj; + Vector3 vector = (Vector3)obj; ((IDataParameter)cmd.Parameters[index]).Value = vector.X; ((IDataParameter)cmd.Parameters[index + 1]).Value = vector.Y; ((IDataParameter)cmd.Parameters[index + 2]).Value = vector.Z; @@ -96,7 +96,7 @@ namespace OpenSim.Data.NHibernate public Type ReturnedType { - get { return typeof(LLVector3); } + get { return typeof(Vector3); } } 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; using System.IO; using System.Reflection; using System.Text.RegularExpressions; -using libsecondlife; +using OpenMetaverse; using log4net; using NHibernate; using NHibernate.Cfg; @@ -101,7 +101,7 @@ namespace OpenSim.Data.NHibernate } - override public AssetBase FetchAsset(LLUUID uuid) + override public AssetBase FetchAsset(UUID uuid) { try { @@ -163,13 +163,13 @@ namespace OpenSim.Data.NHibernate // asset.InvType, temporary, local, assetLength)); // } - override public bool ExistsAsset(LLUUID uuid) + override public bool ExistsAsset(UUID uuid) { m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid); return (FetchAsset(uuid) != null); } - public void DeleteAsset(LLUUID uuid) + public void DeleteAsset(UUID uuid) { } 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; using System.IO; using System.Reflection; using System.Text.RegularExpressions; -using libsecondlife; +using OpenMetaverse; using log4net; using NHibernate; using NHibernate.Cfg; @@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate /// /// The UUID of the item to be returned /// A class containing item information - public InventoryItemBase getInventoryItem(LLUUID item) + public InventoryItemBase getInventoryItem(UUID item) { try { @@ -163,7 +163,7 @@ namespace OpenSim.Data.NHibernate /// /// /// - public void deleteInventoryItem(LLUUID itemID) + public void deleteInventoryItem(UUID itemID) { using (ITransaction transaction = session.BeginTransaction()) { @@ -177,7 +177,7 @@ namespace OpenSim.Data.NHibernate /// /// The UUID of the folder to be returned /// A class containing folder information - public InventoryFolderBase getInventoryFolder(LLUUID folder) + public InventoryFolderBase getInventoryFolder(UUID folder) { try { @@ -235,7 +235,7 @@ namespace OpenSim.Data.NHibernate /// /// /// - public void deleteInventoryFolder(LLUUID folderID) + public void deleteInventoryFolder(UUID folderID) { using (ITransaction transaction = session.BeginTransaction()) { @@ -245,12 +245,12 @@ namespace OpenSim.Data.NHibernate } // useful private methods - private bool ExistsItem(LLUUID uuid) + private bool ExistsItem(UUID uuid) { return (getInventoryItem(uuid) != null) ? true : false; } - private bool ExistsFolder(LLUUID uuid) + private bool ExistsFolder(UUID uuid) { return (getInventoryFolder(uuid) != null) ? true : false; } @@ -314,7 +314,7 @@ namespace OpenSim.Data.NHibernate /// /// The UUID of the target folder /// A List of InventoryItemBase items - public List getInventoryInFolder(LLUUID folderID) + public List getInventoryInFolder(UUID folderID) { // try { ICriteria criteria = session.CreateCriteria(typeof(InventoryItemBase)); @@ -332,16 +332,16 @@ namespace OpenSim.Data.NHibernate // } } - public List getUserRootFolders(LLUUID user) + public List getUserRootFolders(UUID user) { return new List(); } // see InventoryItemBase.getUserRootFolder - public InventoryFolderBase getUserRootFolder(LLUUID user) + public InventoryFolderBase getUserRootFolder(UUID user) { ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); - criteria.Add(Expression.Eq("ParentID", LLUUID.Zero)); + criteria.Add(Expression.Eq("ParentID", UUID.Zero)); criteria.Add(Expression.Eq("Owner", user)); foreach (InventoryFolderBase folder in criteria.List()) { @@ -356,7 +356,7 @@ namespace OpenSim.Data.NHibernate /// /// list where folders will be appended /// ID of parent - private void getInventoryFolders(ref List folders, LLUUID parentID) + private void getInventoryFolders(ref List folders, UUID parentID) { ICriteria criteria = session.CreateCriteria(typeof(InventoryFolderBase)); criteria.Add(Expression.Eq("ParentID", parentID)); @@ -371,7 +371,7 @@ namespace OpenSim.Data.NHibernate /// /// The folder to get subfolders for /// A list of inventory folders - public List getInventoryFolders(LLUUID parentID) + public List getInventoryFolders(UUID parentID) { List folders = new List(); getInventoryFolders(ref folders, parentID); @@ -379,7 +379,7 @@ namespace OpenSim.Data.NHibernate } // See IInventoryDataPlugin - public List getFolderHierarchy(LLUUID parentID) + public List getFolderHierarchy(UUID parentID) { List folders = new List(); 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; using System.IO; using System.Reflection; using System.Text.RegularExpressions; -using libsecondlife; +using OpenMetaverse; using log4net; using NHibernate; using NHibernate.Cfg; @@ -109,7 +109,7 @@ namespace OpenSim.Data.NHibernate { } - public RegionSettings LoadRegionSettings(LLUUID regionUUID) + public RegionSettings LoadRegionSettings(UUID regionUUID) { return null; } @@ -162,7 +162,7 @@ namespace OpenSim.Data.NHibernate /// /// the object /// the region UUID - public void StoreObject(SceneObjectGroup obj, LLUUID regionUUID) + public void StoreObject(SceneObjectGroup obj, UUID regionUUID) { try { @@ -179,7 +179,7 @@ namespace OpenSim.Data.NHibernate } } - private SceneObjectGroup LoadObject(LLUUID uuid, LLUUID region) + private SceneObjectGroup LoadObject(UUID uuid, UUID region) { SceneObjectGroup group = new SceneObjectGroup(); @@ -210,7 +210,7 @@ namespace OpenSim.Data.NHibernate /// /// the object /// the region UUID - public void RemoveObject(LLUUID obj, LLUUID regionUUID) + public void RemoveObject(UUID obj, UUID regionUUID) { SceneObjectGroup g = LoadObject(obj, regionUUID); foreach (SceneObjectPart p in g.Children.Values) @@ -219,7 +219,7 @@ namespace OpenSim.Data.NHibernate } session.Flush(); - m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.UUID, regionUUID); + m_log.InfoFormat("[REGION DB]: Removing obj: {0} from region: {1}", obj.Guid, regionUUID); } @@ -228,9 +228,9 @@ namespace OpenSim.Data.NHibernate /// /// The region UUID /// List of loaded groups - public List LoadObjects(LLUUID regionUUID) + public List LoadObjects(UUID regionUUID) { - Dictionary SOG = new Dictionary(); + Dictionary SOG = new Dictionary(); List ret = new List(); ICriteria criteria = session.CreateCriteria(typeof(SceneObjectPart)); @@ -276,7 +276,7 @@ namespace OpenSim.Data.NHibernate /// /// terrain heightfield /// region UUID - public void StoreTerrain(double[,] ter, LLUUID regionID) + public void StoreTerrain(double[,] ter, UUID regionID) { lock (this) { Terrain t = new Terrain(regionID, ter); @@ -289,7 +289,7 @@ namespace OpenSim.Data.NHibernate /// /// the region UUID /// Heightfield data - public double[,] LoadTerrain(LLUUID regionID) + public double[,] LoadTerrain(UUID regionID) { try { @@ -307,7 +307,7 @@ namespace OpenSim.Data.NHibernate /// /// /// - public void RemoveLandObject(LLUUID globalID) + public void RemoveLandObject(UUID globalID) { } @@ -326,7 +326,7 @@ namespace OpenSim.Data.NHibernate /// /// /// - public List LoadLandObjects(LLUUID regionUUID) + public List LoadLandObjects(UUID regionUUID) { List landDataForRegion = new List(); @@ -347,7 +347,7 @@ namespace OpenSim.Data.NHibernate /// /// the region UUID /// The banlist - public List LoadRegionBanList(LLUUID regionUUID) + public List LoadRegionBanList(UUID regionUUID) { List regionbanlist = new List(); @@ -395,7 +395,7 @@ namespace OpenSim.Data.NHibernate /// /// /// - public void StorePrimInventory(LLUUID primID, ICollection items) + public void StorePrimInventory(UUID primID, ICollection items) { ICriteria criteria = session.CreateCriteria(typeof(TaskInventoryItem)); 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; using System.IO; using System.Reflection; using System.Text.RegularExpressions; -using libsecondlife; +using OpenMetaverse; using log4net; using NHibernate; using NHibernate.Cfg; @@ -90,7 +90,7 @@ namespace OpenSim.Data.NHibernate m.Update(); } - private bool ExistsUser(LLUUID uuid) + private bool ExistsUser(UUID uuid) { UserProfileData user = null; try @@ -105,7 +105,7 @@ namespace OpenSim.Data.NHibernate return (user != null); } - override public UserProfileData GetUserByUUID(LLUUID uuid) + override public UserProfileData GetUserByUUID(UUID uuid) { UserProfileData user; // TODO: I'm sure I'll have to do something silly here @@ -136,7 +136,7 @@ namespace OpenSim.Data.NHibernate } } - private void SetAgentData(LLUUID uuid, UserAgentData agent) + private void SetAgentData(UUID uuid, UserAgentData agent) { if (agent == null) { @@ -190,7 +190,7 @@ namespace OpenSim.Data.NHibernate session.Update(agent); } - override public UserAgentData GetAgentByUUID(LLUUID uuid) + override public UserAgentData GetAgentByUUID(UUID uuid) { try { @@ -225,7 +225,7 @@ namespace OpenSim.Data.NHibernate return GetAgentByName(name.Split(' ')[0], name.Split(' ')[1]); } - override public List GeneratePickerResults(LLUUID queryID, string query) + override public List GeneratePickerResults(UUID queryID, string query) { List results = new List(); string[] querysplit; @@ -249,18 +249,18 @@ namespace OpenSim.Data.NHibernate } // TODO: actually implement these - public override void UpdateUserCurrentRegion(LLUUID avatarid, LLUUID regionuuid, ulong regionhandle) { return; } - public override void StoreWebLoginKey(LLUUID agentID, LLUUID webLoginKey) { return; } - public override void AddNewUserFriend(LLUUID friendlistowner, LLUUID friend, uint perms) { return; } - public override void RemoveUserFriend(LLUUID friendlistowner, LLUUID friend) { return; } - public override void UpdateUserFriendPerms(LLUUID friendlistowner, LLUUID friend, uint perms) { return; } - public override List GetUserFriendList(LLUUID friendlistowner) { return new List(); } - public override bool MoneyTransferRequest(LLUUID from, LLUUID to, uint amount) { return true; } - public override bool InventoryTransferRequest(LLUUID from, LLUUID to, LLUUID inventory) { return true; } + public override void UpdateUserCurrentRegion(UUID avatarid, UUID regionuuid, ulong regionhandle) { return; } + public override void StoreWebLoginKey(UUID agentID, UUID webLoginKey) { return; } + public override void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms) { return; } + public override void RemoveUserFriend(UUID friendlistowner, UUID friend) { return; } + public override void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms) { return; } + public override List GetUserFriendList(UUID friendlistowner) { return new List(); } + public override bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return true; } + public override bool InventoryTransferRequest(UUID from, UUID to, UUID inventory) { return true; } /// Appearance /// TODO: stubs for now to get us to a compiling state gently - public override AvatarAppearance GetUserAppearance(LLUUID user) + public override AvatarAppearance GetUserAppearance(UUID user) { AvatarAppearance appearance; // TODO: I'm sure I'll have to do something silly here @@ -272,7 +272,7 @@ namespace OpenSim.Data.NHibernate return appearance; } - private bool ExistsAppearance(LLUUID uuid) + private bool ExistsAppearance(UUID uuid) { AvatarAppearance appearance; try { @@ -285,7 +285,7 @@ namespace OpenSim.Data.NHibernate } - public override void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) + public override void UpdateUserAppearance(UUID user, AvatarAppearance appearance) { if (appearance == null) return; @@ -303,7 +303,7 @@ namespace OpenSim.Data.NHibernate } } - public override void ResetAttachments(LLUUID userID) + public override void ResetAttachments(UUID userID) { } 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 @@ - + @@ -11,4 +11,4 @@ - \ No newline at end of file + 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 @@ - + - - + + - \ No newline at end of file + 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 @@ - + - - - - + + + + - + - \ No newline at end of file + 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 @@ - + - - + + @@ -15,10 +15,10 @@ - - - - + + + + @@ -26,50 +26,50 @@ - + - + - + - + - + - + - + - + @@ -77,7 +77,7 @@ - + @@ -105,22 +105,22 @@ - + - + - - - - - - - + + + + + + + @@ -132,4 +132,4 @@ - \ No newline at end of file + 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 @@ - + - - - - + + + + @@ -18,4 +18,4 @@ - \ No newline at end of file + 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 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + 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 @@ - + - + @@ -19,12 +19,12 @@ - + - - + + - \ No newline at end of file + 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; using System.Reflection; using OpenSim.Framework; using log4net; -using libsecondlife; +using OpenMetaverse; namespace OpenSim.Data.NHibernate { @@ -39,9 +39,9 @@ namespace OpenSim.Data.NHibernate private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private double[,] map; - private LLUUID regionID; + private UUID regionID; - public Terrain(LLUUID Region, double[,] array) + public Terrain(UUID Region, double[,] array) { map = array; regionID = Region; @@ -51,10 +51,10 @@ namespace OpenSim.Data.NHibernate { map = new double[Constants.RegionSize, Constants.RegionSize]; map.Initialize(); - regionID = LLUUID.Zero; + regionID = UUID.Zero; } - public LLUUID RegionID + public UUID RegionID { get { return regionID; } 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 @@ using System; using System.Data; -using libsecondlife; +using OpenMetaverse; using OpenSim.Framework; using NHibernate; using NHibernate.SqlTypes; @@ -53,12 +53,12 @@ namespace OpenSim.Data.NHibernate if (texture == null) { // TODO: should parametrize this texture out - return new LLObject.TextureEntry(new LLUUID(Constants.DefaultTexture)); + return new Primitive.TextureEntry(new UUID(Constants.DefaultTexture)); } else { - byte[] bytes = ((LLObject.TextureEntry)texture).ToBytes(); - return new LLObject.TextureEntry(bytes, 0, bytes.Length); + byte[] bytes = ((Primitive.TextureEntry)texture).ToBytes(); + return new Primitive.TextureEntry(bytes, 0, bytes.Length); } } @@ -85,7 +85,7 @@ namespace OpenSim.Data.NHibernate if (!rs.IsDBNull(ord)) { byte[] bytes = (byte[])rs[ord]; - texture = new LLObject.TextureEntry(bytes, 0, bytes.Length); + texture = new Primitive.TextureEntry(bytes, 0, bytes.Length); } return texture; @@ -93,7 +93,7 @@ namespace OpenSim.Data.NHibernate public void NullSafeSet(IDbCommand cmd, object obj, int index) { - LLObject.TextureEntry texture = (LLObject.TextureEntry)obj; + Primitive.TextureEntry texture = (Primitive.TextureEntry)obj; ((IDataParameter)cmd.Parameters[index]).Value = texture.ToBytes(); } @@ -104,7 +104,7 @@ namespace OpenSim.Data.NHibernate public Type ReturnedType { - get { return typeof(LLObject.TextureEntry); } + get { return typeof(Primitive.TextureEntry); } } public SqlType[] SqlTypes -- cgit v1.1