diff options
author | lbsa71 | 2008-02-11 14:09:35 +0000 |
---|---|---|
committer | lbsa71 | 2008-02-11 14:09:35 +0000 |
commit | e399141dfb38b7065e68390cc73586846b2206d1 (patch) | |
tree | 39976e86f8f51ad2ab58e2d77bd2634120fe97d1 | |
parent | * some refactoring on permissions (diff) | |
download | opensim-SC-e399141dfb38b7065e68390cc73586846b2206d1.zip opensim-SC-e399141dfb38b7065e68390cc73586846b2206d1.tar.gz opensim-SC-e399141dfb38b7065e68390cc73586846b2206d1.tar.bz2 opensim-SC-e399141dfb38b7065e68390cc73586846b2206d1.tar.xz |
* Added some connection debugging
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLManager.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 |
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 @@ | |||
29 | using System; | 29 | using System; |
30 | using System.Collections.Generic; | 30 | using System.Collections.Generic; |
31 | using System.Data; | 31 | using System.Data; |
32 | using System.Data.SqlClient; | ||
32 | using System.IO; | 33 | using System.IO; |
33 | using System.Reflection; | 34 | using System.Reflection; |
34 | using libsecondlife; | 35 | using 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 |