diff options
| author | BlueWall | 2012-01-22 11:46:16 -0500 |
|---|---|---|
| committer | BlueWall | 2012-01-22 11:46:16 -0500 |
| commit | 1cd26ba85ee50c3b1dea8e3519670866985548fd (patch) | |
| tree | 77d30d1216e6db9fba1b319f9fd258f5bfa6171c /OpenSim | |
| parent | Change the key name I missed in last commit (diff) | |
| download | opensim-SC_OLD-1cd26ba85ee50c3b1dea8e3519670866985548fd.zip opensim-SC_OLD-1cd26ba85ee50c3b1dea8e3519670866985548fd.tar.gz opensim-SC_OLD-1cd26ba85ee50c3b1dea8e3519670866985548fd.tar.bz2 opensim-SC_OLD-1cd26ba85ee50c3b1dea8e3519670866985548fd.tar.xz | |
Hooking up new telehub data to the database
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 3883e24..a2d5435 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -1299,6 +1299,20 @@ namespace OpenSim.Data.MySQL | |||
| 1299 | newSettings.LoadedCreationID = (String) row["loaded_creation_id"]; | 1299 | newSettings.LoadedCreationID = (String) row["loaded_creation_id"]; |
| 1300 | 1300 | ||
| 1301 | newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]); | 1301 | newSettings.TerrainImageID = DBGuid.FromDB(row["map_tile_ID"]); |
| 1302 | newSettings.HasTelehub = Convert.ToBoolean(row["TelehubEnabled"]); | ||
| 1303 | newSettings.TelehubObject = DBGuid.FromDB(row["TelehubObject"]); | ||
| 1304 | newSettings.TelehubName = (string) row["TelehubName"]; | ||
| 1305 | newSettings.TelehubPos = new Vector3 ( | ||
| 1306 | Convert.ToSingle(row["TelehubPosX"]), | ||
| 1307 | Convert.ToSingle(row["TelehubPosY"]), | ||
| 1308 | Convert.ToSingle(row["TelehubPosZ"]) | ||
| 1309 | ); | ||
| 1310 | newSettings.TelehubRot = new Quaternion ( | ||
| 1311 | Convert.ToSingle(row["TelehubRotX"]), | ||
| 1312 | Convert.ToSingle(row["TelehubRotY"]), | ||
| 1313 | Convert.ToSingle(row["TelehubRotZ"]), | ||
| 1314 | Convert.ToSingle(row["TelehubRotW"]) | ||
| 1315 | ); | ||
| 1302 | 1316 | ||
| 1303 | return newSettings; | 1317 | return newSettings; |
| 1304 | } | 1318 | } |