diff options
| author | Dan Lake | 2011-07-11 12:23:20 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-11 12:23:20 -0700 |
| commit | b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch) | |
| tree | 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Region/Physics/Manager | |
| parent | Checkin 32 bit bulletsim shared library for Linux. (diff) | |
| parent | minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff) | |
| download | opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsScene.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 54c50f8..13ea084 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs | |||
| @@ -86,7 +86,10 @@ namespace OpenSim.Region.Physics.Manager | |||
| 86 | Vector3 size, Quaternion rotation, bool isPhysical) | 86 | Vector3 size, Quaternion rotation, bool isPhysical) |
| 87 | { | 87 | { |
| 88 | PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical); | 88 | PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical); |
| 89 | if (ret != null) ret.LocalID = localID; | 89 | |
| 90 | if (ret != null) | ||
| 91 | ret.LocalID = localID; | ||
| 92 | |||
| 90 | return ret; | 93 | return ret; |
| 91 | } | 94 | } |
| 92 | 95 | ||