Fix merge artefacts and build break

avinationmerge
Melanie 2012-01-24 00:45:17 +00:00
parent 616f2b5861
commit 7a87be5015
1 changed files with 1 additions and 1 deletions

View File

@ -1029,7 +1029,7 @@ namespace OpenSim.Data.MySQL
"?SunVectorX, ?SunVectorY, ?SunVectorZ, " + "?SunVectorX, ?SunVectorY, ?SunVectorZ, " +
"?LoadedCreationDateTime, ?LoadedCreationID, " + "?LoadedCreationDateTime, ?LoadedCreationID, " +
"?TerrainImageID, ?block_search, ?casino, " + "?TerrainImageID, ?block_search, ?casino, " +
"?TelehubObject, " + "?TelehubObject";
FillRegionSettingsCommand(cmd, rs); FillRegionSettingsCommand(cmd, rs);