aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs10
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
2 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index f70b505..e763bfa 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -29,6 +29,7 @@
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Data; 31using System.Data;
32using System.Data.SqlClient;
32using System.IO; 33using System.IO;
33using System.Reflection; 34using System.Reflection;
34using libsecondlife; 35using libsecondlife;
@@ -71,7 +72,14 @@ namespace OpenSim.Framework.Data.MySQL
71 username + ";Password=" + password + ";Pooling=" + cpooling + ";"; 72 username + ";Password=" + password + ";Pooling=" + cpooling + ";";
72 dbcon = new MySqlConnection(connectionString); 73 dbcon = new MySqlConnection(connectionString);
73 74
74 dbcon.Open(); 75 try
76 {
77 dbcon.Open();
78 }
79 catch(Exception e)
80 {
81 throw new Exception( "Connection error while using connection string ["+connectionString+"]", e );
82 }
75 83
76 m_log.Info("[MYSQL]: Connection established"); 84 m_log.Info("[MYSQL]: Connection established");
77 } 85 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 78e7868..c94a57d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes
1231 public void UpdatePermissions(LLUUID AgentID, byte field, uint localID, uint mask, byte addRemTF) 1231 public void UpdatePermissions(LLUUID AgentID, byte field, uint localID, uint mask, byte addRemTF)
1232 { 1232 {
1233 SceneObjectPart updatePart = GetChildPart(localID); 1233 SceneObjectPart updatePart = GetChildPart(localID);
1234 updatePart.UpdatePermissions(AgentID, field, localID, mask, addRemTF); 1234 updatePart.UpdatePermissions(AgentID, field, localID, mask, addRemTF);
1235 } 1235 }
1236 1236
1237 #endregion 1237 #endregion