diff options
| author | Melanie | 2013-06-04 21:09:25 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-04 21:09:25 +0100 |
| commit | 648e258b8e79e52df18f41f2ec79016a095f7766 (patch) | |
| tree | de96993d11a0183ac026cec61e0e5a937f801c3c /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | New HttpServer_OpenSim.dll with increased limits on number of connections, re... (diff) | |
| download | opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.zip opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.gz opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.bz2 opensim-SC-648e258b8e79e52df18f41f2ec79016a095f7766.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index e11e365..95bdc7b 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
| @@ -1513,7 +1513,8 @@ public class BSPrim : BSPhysObject | |||
| 1513 | CurrentEntityProperties = entprop; | 1513 | CurrentEntityProperties = entprop; |
| 1514 | 1514 | ||
| 1515 | // Note that BSPrim can be overloaded by BSPrimLinkable which controls updates from root and children prims. | 1515 | // Note that BSPrim can be overloaded by BSPrimLinkable which controls updates from root and children prims. |
| 1516 | base.RequestPhysicsterseUpdate(); | 1516 | |
| 1517 | PhysScene.PostUpdate(this); | ||
| 1517 | } | 1518 | } |
| 1518 | } | 1519 | } |
| 1519 | } | 1520 | } |