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/MySQL/MySQLLegacyRegionData.cs | |
| parent | minor: remove some mono compiler warnings (diff) | |
| parent | Fixed a couple of NREs in corner cases. (diff) | |
| download | opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.zip opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.gz opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.bz2 opensim-SC_OLD-af0e5d097480de264e7501e7d5d35328be5640bb.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLLegacyRegionData.cs')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLLegacyRegionData.cs | 8 |
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); |