diff options
| author | Melanie | 2012-03-03 09:58:57 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-03 09:58:57 +0000 |
| commit | 1f32730798c7633bbed47736a1b302dcd13ce903 (patch) | |
| tree | 2456fc1135e91e56e0d17d9fbe67f147b7f5fda2 /OpenSim/Data/SQLite/SQLiteSimulationData.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove outdated comment about checking attachment prims in Scene.PipeEventsFo... (diff) | |
| download | opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.zip opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.gz opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.bz2 opensim-SC-1f32730798c7633bbed47736a1b302dcd13ce903.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs index 186a586..7e7c08a 100644 --- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs +++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs | |||
| @@ -2157,7 +2157,7 @@ namespace OpenSim.Data.SQLite | |||
| 2157 | row["terrain_raise_limit"] = settings.TerrainRaiseLimit; | 2157 | row["terrain_raise_limit"] = settings.TerrainRaiseLimit; |
| 2158 | row["terrain_lower_limit"] = settings.TerrainLowerLimit; | 2158 | row["terrain_lower_limit"] = settings.TerrainLowerLimit; |
| 2159 | row["use_estate_sun"] = settings.UseEstateSun; | 2159 | row["use_estate_sun"] = settings.UseEstateSun; |
| 2160 | row["Sandbox"] = settings.Sandbox; // database uses upper case S for sandbox | 2160 | row["sandbox"] = settings.Sandbox; // unlike other database modules, sqlite uses a lower case s for sandbox! |
| 2161 | row["sunvectorx"] = settings.SunVector.X; | 2161 | row["sunvectorx"] = settings.SunVector.X; |
| 2162 | row["sunvectory"] = settings.SunVector.Y; | 2162 | row["sunvectory"] = settings.SunVector.Y; |
| 2163 | row["sunvectorz"] = settings.SunVector.Z; | 2163 | row["sunvectorz"] = settings.SunVector.Z; |