diff options
| author | UbitUmarov | 2016-11-27 15:14:34 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-11-27 15:14:34 +0000 |
| commit | 877d3092b45723a2fe8b3a5bbc224cd5d5e55e82 (patch) | |
| tree | f11a5b2d85443fefc81e1958c82828a16fc656cc /OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs | |
| parent | fix pool parameters for httptests (diff) | |
| parent | HG on links request build the URI in http format with a / at end, this should... (diff) | |
| download | opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.zip opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.gz opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.bz2 opensim-SC-877d3092b45723a2fe8b3a5bbc224cd5d5e55e82.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs index 60b24ec..a50905b 100644 --- a/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs +++ b/OpenSim/Region/PhysicsModules/ubOde/ODEPrim.cs | |||
| @@ -2969,6 +2969,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde | |||
| 2969 | 2969 | ||
| 2970 | private void changePhysRepData(ODEPhysRepData repData) | 2970 | private void changePhysRepData(ODEPhysRepData repData) |
| 2971 | { | 2971 | { |
| 2972 | if(_size == repData.size && | ||
| 2973 | _pbs == repData.pbs && | ||
| 2974 | m_shapetype == repData.shapetype && | ||
| 2975 | m_mesh == repData.mesh && | ||
| 2976 | primVolume == repData.volume) | ||
| 2977 | return; | ||
| 2978 | |||
| 2972 | CheckDelaySelect(); | 2979 | CheckDelaySelect(); |
| 2973 | 2980 | ||
| 2974 | OdePrim parent = (OdePrim)_parent; | 2981 | OdePrim parent = (OdePrim)_parent; |