diff options
| author | Melanie | 2012-03-20 12:24:42 +0100 |
|---|---|---|
| committer | Melanie | 2012-03-20 12:24:42 +0100 |
| commit | abd99571984d0b8ac43671565d6955fea5238cbe (patch) | |
| tree | d871d12034ff941c11381c6ce667b1bf8cefd70a | |
| parent | Store and reload extra physics from database (diff) | |
| download | opensim-SC_OLD-abd99571984d0b8ac43671565d6955fea5238cbe.zip opensim-SC_OLD-abd99571984d0b8ac43671565d6955fea5238cbe.tar.gz opensim-SC_OLD-abd99571984d0b8ac43671565d6955fea5238cbe.tar.bz2 opensim-SC_OLD-abd99571984d0b8ac43671565d6955fea5238cbe.tar.xz | |
Fix an invalid cast that only showed at runtime
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLSimulationData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs index 3b53478..33c184f 100644 --- a/OpenSim/Data/MySQL/MySQLSimulationData.cs +++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs | |||
| @@ -1249,7 +1249,7 @@ namespace OpenSim.Data.MySQL | |||
| 1249 | prim.KeyframeMotion = null; | 1249 | prim.KeyframeMotion = null; |
| 1250 | } | 1250 | } |
| 1251 | 1251 | ||
| 1252 | prim.PhysicsShapeType = (byte)row["PhysicsShapeType"]; | 1252 | prim.PhysicsShapeType = (byte)Convert.ToInt32(row["PhysicsShapeType"].ToString()); |
| 1253 | prim.Density = (float)(double)row["Density"]; | 1253 | prim.Density = (float)(double)row["Density"]; |
| 1254 | prim.GravityModifier = (float)(double)row["GravityModifier"]; | 1254 | prim.GravityModifier = (float)(double)row["GravityModifier"]; |
| 1255 | prim.Friction = (float)(double)row["Friction"]; | 1255 | prim.Friction = (float)(double)row["Friction"]; |