diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs index f70b505eef..e763bfa83b 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs @@ -29,6 +29,7 @@ using System; using System.Collections.Generic; using System.Data; +using System.Data.SqlClient; using System.IO; using System.Reflection; using libsecondlife; @@ -71,7 +72,14 @@ namespace OpenSim.Framework.Data.MySQL username + ";Password=" + password + ";Pooling=" + cpooling + ";"; dbcon = new MySqlConnection(connectionString); - dbcon.Open(); + try + { + dbcon.Open(); + } + catch(Exception e) + { + throw new Exception( "Connection error while using connection string ["+connectionString+"]", e ); + } m_log.Info("[MYSQL]: Connection established"); } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 78e7868d67..c94a57d3a9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes public void UpdatePermissions(LLUUID AgentID, byte field, uint localID, uint mask, byte addRemTF) { SceneObjectPart updatePart = GetChildPart(localID); - updatePart.UpdatePermissions(AgentID, field, localID, mask, addRemTF); + updatePart.UpdatePermissions(AgentID, field, localID, mask, addRemTF); } #endregion