* Apply mantis patches 2939, 2980 and 2995

* All these are necessary to get MSSQL working again
* Thanks to StrawberryFride for pointing this out

OpenSim/Data/MSSQL/MSSQLManager.cs

@@ -171,6 +171,10 @@ namespace OpenSim.Data.MSSQL
             {
                 return SqlDbType.Float;
             }
+            if (type == typeof(Single))
+            {
+                return SqlDbType.Float;
+            }
             if (type == typeof(int))
             {
                 return SqlDbType.Int;
@@ -185,7 +189,7 @@ namespace OpenSim.Data.MSSQL
             }
             if (type == typeof(sbyte))
             {
-                return SqlDbType.TinyInt;
+                return SqlDbType.Int;
             }
             if (type == typeof(Byte[]))
             {
@@ -215,6 +219,10 @@ namespace OpenSim.Data.MSSQL
             {
                 return value.ToString();
             }
+            if (valueType == typeof(OpenMetaverse.UUID))
+            {
+                return value.ToString();
+            }
             if (valueType == typeof(bool))
             {
                 return (bool)value ? 1 : 0;
@@ -223,6 +231,10 @@ namespace OpenSim.Data.MSSQL
             {
                 return value;
             }
+            if (valueType == typeof(int))
+            {
+                return value;
+            }
             return value;
         }
 
@@ -269,6 +281,11 @@ namespace OpenSim.Data.MSSQL
 
         private static readonly Dictionary<string, string> emptyDictionary = new Dictionary<string, string>();
 
+        /// <summary>
+        /// Run a query and return a sql db command
+        /// </summary>
+        /// <param name="sql">The SQL query.</param>
+        /// <returns></returns>
         internal AutoClosingSqlCommand Query(string sql)
         {
             return Query(sql, emptyDictionary);

OpenSim/Data/MSSQL/MSSQLUserData.cs

@@ -482,8 +482,8 @@ namespace OpenSim.Data.MSSQL
                             while (reader.Read())
                             {
                                 FriendRegionInfo fri = new FriendRegionInfo();
-                                fri.isOnline = (sbyte)reader["agentOnline"] != 0;
-                                fri.regionHandle = (ulong)reader["currentHandle"];
+                                fri.isOnline = (byte)reader["agentOnline"] != 0;
+                                fri.regionHandle = Convert.ToUInt64(reader["currentHandle"].ToString());
 
                                 infos[uuid] = fri;
                             }

OpenSim/Data/MSSQL/Resources/012_RegionStore.sql

@@ -0,0 +1,5 @@
+BEGIN TRANSACTION
+
+ALTER TABLE prims ADD LinkNumber integer not null default 0
+
+COMMIT

OpenSim/Framework/Communications/LoginService.cs

@@ -379,7 +379,11 @@ namespace OpenSim.Framework.Communications
                             return logResponse.CreateLoginFailedResponseLLSD();
                         }
                     }
+                    else
+                        return logResponse.CreateLoginFailedResponseLLSD();
                 }
+                else
+                    return logResponse.CreateLoginFailedResponseLLSD();
 
                
                 if (userProfile.GodLevel < m_minLoginLevel)