diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/NHibernate/TextureUserType.cs | 14 |
1 files changed, 7 insertions, 7 deletions
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 | ||
28 | using System; | 28 | using System; |
29 | using System.Data; | 29 | using System.Data; |
30 | using libsecondlife; | 30 | using OpenMetaverse; |
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using NHibernate; | 32 | using NHibernate; |
33 | using NHibernate.SqlTypes; | 33 | using 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 |