diff options
author | Justin Clarke Casey | 2008-12-02 15:22:58 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-12-02 15:22:58 +0000 |
commit | dde32f1130f83f9471fea474b1ebc9e0520be561 (patch) | |
tree | dc8683d7b14ada4aa07497da3ed4b5d7b79c57b8 /OpenSim/Data/NHibernate/LLVector3UserType.cs | |
parent | * Resolve http://opensimulator.org/mantis/view.php?id=2743 and http://opensim... (diff) | |
download | opensim-SC_OLD-dde32f1130f83f9471fea474b1ebc9e0520be561.zip opensim-SC_OLD-dde32f1130f83f9471fea474b1ebc9e0520be561.tar.gz opensim-SC_OLD-dde32f1130f83f9471fea474b1ebc9e0520be561.tar.bz2 opensim-SC_OLD-dde32f1130f83f9471fea474b1ebc9e0520be561.tar.xz |
* Reapply http://opensimulator.org/mantis/view.php?id=2710
* This patch gets NHibernate working
*** PLEASE NOTE: This patch now requires the libmono-oracle2.0-cil library to be installed on Ubuntu (to stop the System.Data.Oracle missing failure) ***
* Not sure what the dependency is on other distros. Adding this info to http://opensimulator.org/wiki/Build_Instructions would be most welcome
* Adds Castle.* libraries that were missing last time (note, dlls have been added from http://downloads.sourceforge.net/nhibernate/NHibernate-2.0.1.GA-bin.zip)
Diffstat (limited to 'OpenSim/Data/NHibernate/LLVector3UserType.cs')
-rw-r--r-- | OpenSim/Data/NHibernate/LLVector3UserType.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Data/NHibernate/LLVector3UserType.cs b/OpenSim/Data/NHibernate/LLVector3UserType.cs index cdd15ec..25a2bc6 100644 --- a/OpenSim/Data/NHibernate/LLVector3UserType.cs +++ b/OpenSim/Data/NHibernate/LLVector3UserType.cs | |||
@@ -74,9 +74,12 @@ namespace OpenSim.Data.NHibernate | |||
74 | int x = rs.GetOrdinal(names[0]); | 74 | int x = rs.GetOrdinal(names[0]); |
75 | int y = rs.GetOrdinal(names[1]); | 75 | int y = rs.GetOrdinal(names[1]); |
76 | int z = rs.GetOrdinal(names[2]); | 76 | int z = rs.GetOrdinal(names[2]); |
77 | if (!rs.IsDBNull(x)) | 77 | if (!rs.IsDBNull(x) && !rs.IsDBNull(y) && !rs.IsDBNull(z)) |
78 | { | 78 | { |
79 | vector = new Vector3((Single)rs[x], (Single)rs[y], (Single)rs[z]); | 79 | float X = (Single)Convert.ToDouble(rs[x].ToString()); |
80 | float Y = (Single)Convert.ToDouble(rs[y].ToString()); | ||
81 | float Z = (Single)Convert.ToDouble(rs[z].ToString()); | ||
82 | vector = new Vector3(X, Y, Z); | ||
80 | } | 83 | } |
81 | return vector; | 84 | return vector; |
82 | } | 85 | } |