diff options
| author | BlueWall | 2012-03-02 15:02:09 -0500 |
|---|---|---|
| committer | BlueWall | 2012-03-02 15:02:09 -0500 |
| commit | 6fc350725da5132eefe14897644d672ce586c5db (patch) | |
| tree | d73af5d1d9bc61143fbac24a4dd54256a1394c97 /OpenSim/Data/MSSQL | |
| parent | Merge branch 'master' of /home/opensim/src/opensim into v3_support (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-6fc350725da5132eefe14897644d672ce586c5db.zip opensim-SC-6fc350725da5132eefe14897644d672ce586c5db.tar.gz opensim-SC-6fc350725da5132eefe14897644d672ce586c5db.tar.bz2 opensim-SC-6fc350725da5132eefe14897644d672ce586c5db.tar.xz | |
Merge branch 'master' into v3_support
Diffstat (limited to 'OpenSim/Data/MSSQL')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index e58620a..d6b1561 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs | |||
| @@ -1367,7 +1367,7 @@ VALUES | |||
| 1367 | newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]); | 1367 | newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]); |
| 1368 | newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]); | 1368 | newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]); |
| 1369 | newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]); | 1369 | newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]); |
| 1370 | newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]); | 1370 | newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]); |
| 1371 | newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); | 1371 | newSettings.FixedSun = Convert.ToBoolean(row["fixed_sun"]); |
| 1372 | newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); | 1372 | newSettings.SunPosition = Convert.ToDouble(row["sun_position"]); |
| 1373 | newSettings.SunVector = new Vector3( | 1373 | newSettings.SunVector = new Vector3( |
| @@ -1782,7 +1782,7 @@ VALUES | |||
| 1782 | parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit)); | 1782 | parameters.Add(_Database.CreateParameter("terrain_raise_limit", settings.TerrainRaiseLimit)); |
| 1783 | parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit)); | 1783 | parameters.Add(_Database.CreateParameter("terrain_lower_limit", settings.TerrainLowerLimit)); |
| 1784 | parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun)); | 1784 | parameters.Add(_Database.CreateParameter("use_estate_sun", settings.UseEstateSun)); |
| 1785 | parameters.Add(_Database.CreateParameter("sandbox", settings.Sandbox)); | 1785 | parameters.Add(_Database.CreateParameter("Sandbox", settings.Sandbox)); |
| 1786 | parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun)); | 1786 | parameters.Add(_Database.CreateParameter("fixed_sun", settings.FixedSun)); |
| 1787 | parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition)); | 1787 | parameters.Add(_Database.CreateParameter("sun_position", settings.SunPosition)); |
| 1788 | parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X)); | 1788 | parameters.Add(_Database.CreateParameter("sunvectorx", settings.SunVector.X)); |