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

(limited to 'OpenSim/Data/OpenSimObjectFieldMapper.cs')

diff --git a/OpenSim/Data/OpenSimObjectFieldMapper.cs b/OpenSim/Data/OpenSimObjectFieldMapper.cs
index ff375fb..a342494 100644
--- a/OpenSim/Data/OpenSimObjectFieldMapper.cs
+++ b/OpenSim/Data/OpenSimObjectFieldMapper.cs
@@ -28,7 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
-using libsecondlife;
+using OpenMetaverse;
 using OpenSim.Data.Base;
 
 namespace OpenSim.Data
@@ -47,17 +47,17 @@ namespace OpenSim.Data
             string fieldName = FieldName;
             object value = GetParamValue(obj);
 
-            if (ValueType == typeof(LLVector3))
+            if (ValueType == typeof(Vector3))
             {
-                LLVector3 vector = (LLVector3)value;
+                Vector3 vector = (Vector3)value;
 
                 RawAddParam(command, fieldNames, fieldName + "X", vector.X);
                 RawAddParam(command, fieldNames, fieldName + "Y", vector.Y);
                 RawAddParam(command, fieldNames, fieldName + "Z", vector.Z);
             }
-            else if (ValueType == typeof(LLQuaternion))
+            else if (ValueType == typeof(Quaternion))
             {
-                LLQuaternion quaternion = (LLQuaternion)value;
+                Quaternion quaternion = (Quaternion)value;
 
                 RawAddParam(command, fieldNames, fieldName + "X", quaternion.X);
                 RawAddParam(command, fieldNames, fieldName + "Y", quaternion.Y);
@@ -76,18 +76,18 @@ namespace OpenSim.Data
 
             OpenSimDataReader osreader = (OpenSimDataReader) reader;
 
-            if (ValueType == typeof(LLVector3))
+            if (ValueType == typeof(Vector3))
             {
                 value = osreader.GetVector(FieldName);
             }
-            else if (ValueType == typeof(LLQuaternion))
+            else if (ValueType == typeof(Quaternion))
             {
                 value = osreader.GetQuaternion(FieldName);
             }
-            else if (ValueType == typeof(LLUUID))
+            else if (ValueType == typeof(UUID))
             {
                 Guid guid = reader.GetGuid(FieldName);
-                value = new LLUUID(guid);
+                value = new UUID(guid);
             }
             else
             {
-- 
cgit v1.1