diff options
author | Justin Clark-Casey (justincc) | 2012-02-29 00:33:17 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-02-29 00:33:17 +0000 |
commit | 40c838896c18a9ee0283386cdcdc13adec5ae3d6 (patch) | |
tree | 1c7a0023688da958c801896ba3ceb764f97d1648 | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-40c838896c18a9ee0283386cdcdc13adec5ae3d6.zip opensim-SC_OLD-40c838896c18a9ee0283386cdcdc13adec5ae3d6.tar.gz opensim-SC_OLD-40c838896c18a9ee0283386cdcdc13adec5ae3d6.tar.bz2 opensim-SC_OLD-40c838896c18a9ee0283386cdcdc13adec5ae3d6.tar.xz |
Use correct casing of RegionSettings.Sandbox in the various database modules.
MySQL and MSSQL have it as Sandbox, sqlite as sandbox.
In various different places in every plugin the wrong casing is used...
Consistency, who needs it? Or one day sqlite can change to Sandbox.
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteSimulationData.cs | 2 |
3 files changed, 4 insertions, 4 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)); |
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 7c995ad..381a514 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
@@ -1283,7 +1283,7 @@ namespace OpenSim.Data.MySQL | |||
1283 | newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]); | 1283 | newSettings.TerrainRaiseLimit = Convert.ToDouble(row["terrain_raise_limit"]); |
1284 | newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]); | 1284 | newSettings.TerrainLowerLimit = Convert.ToDouble(row["terrain_lower_limit"]); |
1285 | newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]); | 1285 | newSettings.UseEstateSun = Convert.ToBoolean(row["use_estate_sun"]); |
1286 | newSettings.Sandbox = Convert.ToBoolean(row["sandbox"]); | 1286 | newSettings.Sandbox = Convert.ToBoolean(row["Sandbox"]); |
1287 | newSettings.SunVector = new Vector3 ( | 1287 | newSettings.SunVector = new Vector3 ( |
1288 | Convert.ToSingle(row["sunvectorx"]), | 1288 | Convert.ToSingle(row["sunvectorx"]), |
1289 | Convert.ToSingle(row["sunvectory"]), | 1289 | Convert.ToSingle(row["sunvectory"]), |
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; |