aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorJohn Hurliman2009-11-02 11:28:35 -0800
committerJohn Hurliman2009-11-02 11:28:35 -0800
commit67ac9881faf2034facfe92613538938695c2cda9 (patch)
treeac2fcdfe3c9c99120ba2c9901d5175e1389fa622 /OpenSim/Data
parentReverting the memory leak patch for MySQL. Problems have been reported with t... (diff)
downloadopensim-SC-67ac9881faf2034facfe92613538938695c2cda9.zip
opensim-SC-67ac9881faf2034facfe92613538938695c2cda9.tar.gz
opensim-SC-67ac9881faf2034facfe92613538938695c2cda9.tar.bz2
opensim-SC-67ac9881faf2034facfe92613538938695c2cda9.tar.xz
Removing duplicate SceneObjectPart.RotationalVelocity property
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs8
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs8
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs8
3 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index cff6b00..6371307 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -1049,7 +1049,7 @@ VALUES
1049 if (!(primRow["ParticleSystem"] is DBNull)) 1049 if (!(primRow["ParticleSystem"] is DBNull))
1050 prim.ParticleSystem = (Byte[])primRow["ParticleSystem"]; 1050 prim.ParticleSystem = (Byte[])primRow["ParticleSystem"];
1051 1051
1052 prim.RotationalVelocity = new Vector3( 1052 prim.AngularVelocity = new Vector3(
1053 Convert.ToSingle(primRow["OmegaX"]), 1053 Convert.ToSingle(primRow["OmegaX"]),
1054 Convert.ToSingle(primRow["OmegaY"]), 1054 Convert.ToSingle(primRow["OmegaY"]),
1055 Convert.ToSingle(primRow["OmegaZ"])); 1055 Convert.ToSingle(primRow["OmegaZ"]));
@@ -1429,9 +1429,9 @@ VALUES
1429 parameters.Add(_Database.CreateParameter("TextureAnimation", prim.TextureAnimation)); 1429 parameters.Add(_Database.CreateParameter("TextureAnimation", prim.TextureAnimation));
1430 parameters.Add(_Database.CreateParameter("ParticleSystem", prim.ParticleSystem)); 1430 parameters.Add(_Database.CreateParameter("ParticleSystem", prim.ParticleSystem));
1431 1431
1432 parameters.Add(_Database.CreateParameter("OmegaX", prim.RotationalVelocity.X)); 1432 parameters.Add(_Database.CreateParameter("OmegaX", prim.AngularVelocity.X));
1433 parameters.Add(_Database.CreateParameter("OmegaY", prim.RotationalVelocity.Y)); 1433 parameters.Add(_Database.CreateParameter("OmegaY", prim.AngularVelocity.Y));
1434 parameters.Add(_Database.CreateParameter("OmegaZ", prim.RotationalVelocity.Z)); 1434 parameters.Add(_Database.CreateParameter("OmegaZ", prim.AngularVelocity.Z));
1435 1435
1436 parameters.Add(_Database.CreateParameter("CameraEyeOffsetX", prim.GetCameraEyeOffset().X)); 1436 parameters.Add(_Database.CreateParameter("CameraEyeOffsetX", prim.GetCameraEyeOffset().X));
1437 parameters.Add(_Database.CreateParameter("CameraEyeOffsetY", prim.GetCameraEyeOffset().Y)); 1437 parameters.Add(_Database.CreateParameter("CameraEyeOffsetY", prim.GetCameraEyeOffset().Y));
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index a807948..c49153f 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -908,7 +908,7 @@ namespace OpenSim.Data.MySQL
908 if (!(row["ParticleSystem"] is DBNull)) 908 if (!(row["ParticleSystem"] is DBNull))
909 prim.ParticleSystem = (byte[])row["ParticleSystem"]; 909 prim.ParticleSystem = (byte[])row["ParticleSystem"];
910 910
911 prim.RotationalVelocity = new Vector3( 911 prim.AngularVelocity = new Vector3(
912 (float)(double)row["OmegaX"], 912 (float)(double)row["OmegaX"],
913 (float)(double)row["OmegaY"], 913 (float)(double)row["OmegaY"],
914 (float)(double)row["OmegaZ"] 914 (float)(double)row["OmegaZ"]
@@ -1240,9 +1240,9 @@ namespace OpenSim.Data.MySQL
1240 cmd.Parameters.AddWithValue("TextureAnimation", prim.TextureAnimation); 1240 cmd.Parameters.AddWithValue("TextureAnimation", prim.TextureAnimation);
1241 cmd.Parameters.AddWithValue("ParticleSystem", prim.ParticleSystem); 1241 cmd.Parameters.AddWithValue("ParticleSystem", prim.ParticleSystem);
1242 1242
1243 cmd.Parameters.AddWithValue("OmegaX", (double)prim.RotationalVelocity.X); 1243 cmd.Parameters.AddWithValue("OmegaX", (double)prim.AngularVelocity.X);
1244 cmd.Parameters.AddWithValue("OmegaY", (double)prim.RotationalVelocity.Y); 1244 cmd.Parameters.AddWithValue("OmegaY", (double)prim.AngularVelocity.Y);
1245 cmd.Parameters.AddWithValue("OmegaZ", (double)prim.RotationalVelocity.Z); 1245 cmd.Parameters.AddWithValue("OmegaZ", (double)prim.AngularVelocity.Z);
1246 1246
1247 cmd.Parameters.AddWithValue("CameraEyeOffsetX", (double)prim.GetCameraEyeOffset().X); 1247 cmd.Parameters.AddWithValue("CameraEyeOffsetX", (double)prim.GetCameraEyeOffset().X);
1248 cmd.Parameters.AddWithValue("CameraEyeOffsetY", (double)prim.GetCameraEyeOffset().Y); 1248 cmd.Parameters.AddWithValue("CameraEyeOffsetY", (double)prim.GetCameraEyeOffset().Y);
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 08af7c3..b68de1a 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -1213,7 +1213,7 @@ namespace OpenSim.Data.SQLite
1213 if (!row.IsNull("ParticleSystem")) 1213 if (!row.IsNull("ParticleSystem"))
1214 prim.ParticleSystem = Convert.FromBase64String(row["ParticleSystem"].ToString()); 1214 prim.ParticleSystem = Convert.FromBase64String(row["ParticleSystem"].ToString());
1215 1215
1216 prim.RotationalVelocity = new Vector3( 1216 prim.AngularVelocity = new Vector3(
1217 Convert.ToSingle(row["OmegaX"]), 1217 Convert.ToSingle(row["OmegaX"]),
1218 Convert.ToSingle(row["OmegaY"]), 1218 Convert.ToSingle(row["OmegaY"]),
1219 Convert.ToSingle(row["OmegaZ"]) 1219 Convert.ToSingle(row["OmegaZ"])
@@ -1530,9 +1530,9 @@ namespace OpenSim.Data.SQLite
1530 row["TextureAnimation"] = Convert.ToBase64String(prim.TextureAnimation); 1530 row["TextureAnimation"] = Convert.ToBase64String(prim.TextureAnimation);
1531 row["ParticleSystem"] = Convert.ToBase64String(prim.ParticleSystem); 1531 row["ParticleSystem"] = Convert.ToBase64String(prim.ParticleSystem);
1532 1532
1533 row["OmegaX"] = prim.RotationalVelocity.X; 1533 row["OmegaX"] = prim.AngularVelocity.X;
1534 row["OmegaY"] = prim.RotationalVelocity.Y; 1534 row["OmegaY"] = prim.AngularVelocity.Y;
1535 row["OmegaZ"] = prim.RotationalVelocity.Z; 1535 row["OmegaZ"] = prim.AngularVelocity.Z;
1536 1536
1537 row["CameraEyeOffsetX"] = prim.GetCameraEyeOffset().X; 1537 row["CameraEyeOffsetX"] = prim.GetCameraEyeOffset().X;
1538 row["CameraEyeOffsetY"] = prim.GetCameraEyeOffset().Y; 1538 row["CameraEyeOffsetY"] = prim.GetCameraEyeOffset().Y;