aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/OpenSimObjectFieldMapper.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-06 07:52:41 +0000
committerTeravus Ovares2008-09-06 07:52:41 +0000
commit7d89e122930be39e84a6d174548fa2d12ac0484a (patch)
treee5aa5752f988a9aba2a969f49e5e208985eda80c /OpenSim/Data/OpenSimObjectFieldMapper.cs
parent* minor: speculatively try a change to bamboo.build to see if this generates ... (diff)
downloadopensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.zip
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.gz
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.bz2
opensim-SC-7d89e122930be39e84a6d174548fa2d12ac0484a.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Data/OpenSimObjectFieldMapper.cs')
-rw-r--r--OpenSim/Data/OpenSimObjectFieldMapper.cs18
1 files changed, 9 insertions, 9 deletions
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 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data.Common; 30using System.Data.Common;
31using libsecondlife; 31using OpenMetaverse;
32using OpenSim.Data.Base; 32using OpenSim.Data.Base;
33 33
34namespace OpenSim.Data 34namespace OpenSim.Data
@@ -47,17 +47,17 @@ namespace OpenSim.Data
47 string fieldName = FieldName; 47 string fieldName = FieldName;
48 object value = GetParamValue(obj); 48 object value = GetParamValue(obj);
49 49
50 if (ValueType == typeof(LLVector3)) 50 if (ValueType == typeof(Vector3))
51 { 51 {
52 LLVector3 vector = (LLVector3)value; 52 Vector3 vector = (Vector3)value;
53 53
54 RawAddParam(command, fieldNames, fieldName + "X", vector.X); 54 RawAddParam(command, fieldNames, fieldName + "X", vector.X);
55 RawAddParam(command, fieldNames, fieldName + "Y", vector.Y); 55 RawAddParam(command, fieldNames, fieldName + "Y", vector.Y);
56 RawAddParam(command, fieldNames, fieldName + "Z", vector.Z); 56 RawAddParam(command, fieldNames, fieldName + "Z", vector.Z);
57 } 57 }
58 else if (ValueType == typeof(LLQuaternion)) 58 else if (ValueType == typeof(Quaternion))
59 { 59 {
60 LLQuaternion quaternion = (LLQuaternion)value; 60 Quaternion quaternion = (Quaternion)value;
61 61
62 RawAddParam(command, fieldNames, fieldName + "X", quaternion.X); 62 RawAddParam(command, fieldNames, fieldName + "X", quaternion.X);
63 RawAddParam(command, fieldNames, fieldName + "Y", quaternion.Y); 63 RawAddParam(command, fieldNames, fieldName + "Y", quaternion.Y);
@@ -76,18 +76,18 @@ namespace OpenSim.Data
76 76
77 OpenSimDataReader osreader = (OpenSimDataReader) reader; 77 OpenSimDataReader osreader = (OpenSimDataReader) reader;
78 78
79 if (ValueType == typeof(LLVector3)) 79 if (ValueType == typeof(Vector3))
80 { 80 {
81 value = osreader.GetVector(FieldName); 81 value = osreader.GetVector(FieldName);
82 } 82 }
83 else if (ValueType == typeof(LLQuaternion)) 83 else if (ValueType == typeof(Quaternion))
84 { 84 {
85 value = osreader.GetQuaternion(FieldName); 85 value = osreader.GetQuaternion(FieldName);
86 } 86 }
87 else if (ValueType == typeof(LLUUID)) 87 else if (ValueType == typeof(UUID))
88 { 88 {
89 Guid guid = reader.GetGuid(FieldName); 89 Guid guid = reader.GetGuid(FieldName);
90 value = new LLUUID(guid); 90 value = new UUID(guid);
91 } 91 }
92 else 92 else
93 { 93 {