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