aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
diff options
context:
space:
mode:
authorKittoFlora2009-11-02 21:53:51 +0100
committerKittoFlora2009-11-02 21:53:51 +0100
commit2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a (patch)
treee44fc76f1cb7154ecbdfa6e36f961fdc5be311c3 /OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
parentMerge branch 'master' into vehicles (diff)
parentRemoving Console.WriteLine()s that were brought in with the revert (diff)
downloadopensim-SC_OLD-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.zip
opensim-SC_OLD-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.gz
opensim-SC_OLD-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.bz2
opensim-SC_OLD-2ec022cf133534bbed4ca5e73fdb1d5a5a40bb3a.tar.xz
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLLegacyRegionData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs8
1 files changed, 4 insertions, 4 deletions
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);