aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLSimulationData.cs
diff options
context:
space:
mode:
authorTom2011-09-04 07:06:36 -0700
committerTom2011-09-04 07:06:36 -0700
commit66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch)
tree76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/Data/MySQL/MySQLSimulationData.cs
parentGuard another nullref (diff)
parentFixed BulletSim config files for Linux *.so libraries. (diff)
downloadopensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip
opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz
opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2
opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLSimulationData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs17
1 files changed, 0 insertions, 17 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index cdaf5b7..b9228d1 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -78,23 +78,6 @@ namespace OpenSim.Data.MySQL
78 // 78 //
79 Migration m = new Migration(dbcon, Assembly, "RegionStore"); 79 Migration m = new Migration(dbcon, Assembly, "RegionStore");
80 m.Update(); 80 m.Update();
81
82 // Clean dropped attachments
83 //
84 try
85 {
86 using (MySqlCommand cmd = dbcon.CreateCommand())
87 {
88 cmd.CommandText = "delete from prims, primshapes using prims " +
89 "left join primshapes on prims.uuid = primshapes.uuid " +
90 "where PCode = 9 and State <> 0";
91 ExecuteNonQuery(cmd);
92 }
93 }
94 catch (MySqlException ex)
95 {
96 m_log.Error("[REGION DB]: Error cleaning up dropped attachments: " + ex.Message);
97 }
98 } 81 }
99 } 82 }
100 83