diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/LLVector3UserType.cs | 12 |
1 files changed, 6 insertions, 6 deletions
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 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | using NHibernate; | 31 | using NHibernate; |
32 | using NHibernate.SqlTypes; | 32 | using NHibernate.SqlTypes; |
33 | using NHibernate.UserTypes; | 33 | using NHibernate.UserTypes; |
@@ -35,7 +35,7 @@ using NHibernate.UserTypes; | |||
35 | namespace OpenSim.Data.NHibernate | 35 | namespace 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 |