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/TextureUserType.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Data/NHibernate/TextureUserType.cs')

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