diff options
| author | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-11-03 19:11:09 +0000 |
| commit | af0e5d097480de264e7501e7d5d35328be5640bb (patch) | |
| tree | 4ca5cd796ed9618dc9134a6e5eee1f7e7912bee4 /OpenSim/Data/SQLite | |
| parent | minor: remove some mono compiler warnings (diff) | |
| parent | Fixed a couple of NREs in corner cases. (diff) | |
| download | opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.zip opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.gz opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.bz2 opensim-SC-af0e5d097480de264e7501e7d5d35328be5640bb.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteRegionData.cs | 8 |
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; |