Fix merge artefacts and build break

2012-01-24 00:45:17 +00:00 · 2012-01-24 00:45:17 +00:00 · 7a87be5015
parent 616f2b5861
commit 7a87be5015
1 changed files with 1 additions and 1 deletions
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@ -1029,7 +1029,7 @@ namespace OpenSim.Data.MySQL
                            "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
                            "?LoadedCreationDateTime, ?LoadedCreationID, " +
                            "?TerrainImageID, ?block_search, ?casino, " +
-                            "?TelehubObject, " +
+                            "?TelehubObject";

                        FillRegionSettingsCommand(cmd, rs);