* Unforunately it turns out not to be that simple. Revert the rest of r7560 for now.

1 files changed, 2 insertions, 5 deletions

diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs
index 25a2bc6..cdd15ec 100644
--- a/OpenSim/Data/NHibernate/LLVector3UserType.cs
+++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs
@@ -74,12 +74,9 @@ namespace OpenSim.Data.NHibernate
             int x = rs.GetOrdinal(names[0]);
             int y = rs.GetOrdinal(names[1]);
             int z = rs.GetOrdinal(names[2]);
-            if (!rs.IsDBNull(x) && !rs.IsDBNull(y) && !rs.IsDBNull(z))
+            if (!rs.IsDBNull(x))
             {
-                float X = (Single)Convert.ToDouble(rs[x].ToString());
-                float Y = (Single)Convert.ToDouble(rs[y].ToString());
-                float Z = (Single)Convert.ToDouble(rs[z].ToString());
-                vector = new Vector3(X, Y, Z);
+                vector = new Vector3((Single)rs[x], (Single)rs[y], (Single)rs[z]);
             }
             return vector;
         }