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/LLVector3UserType.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'OpenSim/Data/NHibernate/LLVector3UserType.cs') 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 -- cgit v1.1