diff options
| author | Melanie | 2012-01-24 00:45:17 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-24 00:45:17 +0000 |
| commit | 7a87be50151e5d39ffb96ce7ff923db6d067a950 (patch) | |
| tree | 2b7a812367917c08594a3a46f05f2f81c1fc6875 /OpenSim | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-7a87be50151e5d39ffb96ce7ff923db6d067a950.zip opensim-SC-7a87be50151e5d39ffb96ce7ff923db6d067a950.tar.gz opensim-SC-7a87be50151e5d39ffb96ce7ff923db6d067a950.tar.bz2 opensim-SC-7a87be50151e5d39ffb96ce7ff923db6d067a950.tar.xz | |
Fix merge artefacts and build break
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index a346548..f750a86 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -1029,7 +1029,7 @@ namespace OpenSim.Data.MySQL | |||
| 1029 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + | 1029 | "?SunVectorX, ?SunVectorY, ?SunVectorZ, " + |
| 1030 | "?LoadedCreationDateTime, ?LoadedCreationID, " + | 1030 | "?LoadedCreationDateTime, ?LoadedCreationID, " + |
| 1031 | "?TerrainImageID, ?block_search, ?casino, " + | 1031 | "?TerrainImageID, ?block_search, ?casino, " + |
| 1032 | "?TelehubObject, " + | 1032 | "?TelehubObject"; |
| 1033 | 1033 | ||
| 1034 | FillRegionSettingsCommand(cmd, rs); | 1034 | FillRegionSettingsCommand(cmd, rs); |
| 1035 | 1035 | ||