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/MySQL | |
| 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/MySQL')
| -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 04b91ef..80105b2 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -1299,7 +1299,7 @@ namespace OpenSim.Data.MySQL | |||
| 1299 | newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]); | 1299 | newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]); |
| 1300 | newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]); | 1300 | newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]); |
| 1301 | newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]); | 1301 | newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]); |
| 1302 | newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]); | 1302 | newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]); |
| 1303 | newSettings.SunVector = new Vector3 ( | 1303 | newSettings.SunVector = new Vector3 ( |
| 1304 | Convert.ToSingle(row["sunvectorx"]), | 1304 | Convert.ToSingle(row["sunvectorx"]), |
| 1305 | Convert.ToSingle(row["sunvectory"]), | 1305 | Convert.ToSingle(row["sunvectory"]), |