* Apply http://opensimulator.org/mantis/view.php?id=3586

* Make MSSQL current in NHibernate
* Thanks mpallari

1 files changed, 10 insertions, 1 deletions

diff --git a/OpenSim/Data/NHibernate/SByteType.cs b/OpenSim/Data/NHibernate/SByteType.cs
index b2bbe74..92ab0ba 100644
--- a/OpenSim/Data/NHibernate/SByteType.cs
+++ b/OpenSim/Data/NHibernate/SByteType.cs
@@ -73,7 +73,16 @@ namespace OpenSim.Data.NHibernate
             int ord = rs.GetOrdinal(names[0]);
             if (!rs.IsDBNull(ord))
             {
-                sbyte1 = Convert.ToSByte(rs.GetInt16(ord));
+                object tempO = rs.GetValue(ord);
+                if (tempO is Byte)
+                {
+                    sbyte1 = Convert.ToSByte(((byte)tempO));
+                }
+                else
+                {
+                    short temp = rs.GetInt16(ord);
+                    sbyte1 = Convert.ToSByte(temp);
+                }
             }
             return sbyte1;
         }