Fix merge artefacts and build break
parent
616f2b5861
commit
7a87be5015
|
@ -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);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue