diff options
| author | Melanie | 2011-12-23 01:00:34 +0000 |
|---|---|---|
| committer | Melanie | 2011-12-23 01:00:34 +0000 |
| commit | b8a914b15b57668c846ddda29686bbfffa9db1ee (patch) | |
| tree | e4c776056947e410daa3d91d1a5e3c1dc3210a72 /OpenSim/Region/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fixes some problems with objects that attempt to cross a region boundary (diff) | |
| download | opensim-SC-b8a914b15b57668c846ddda29686bbfffa9db1ee.zip opensim-SC-b8a914b15b57668c846ddda29686bbfffa9db1ee.tar.gz opensim-SC-b8a914b15b57668c846ddda29686bbfffa9db1ee.tar.bz2 opensim-SC-b8a914b15b57668c846ddda29686bbfffa9db1ee.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 7723eba..48a870e 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -273,7 +273,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 273 | /// </remarks> | 273 | /// </remarks> |
| 274 | public bool UsesPhysics | 274 | public bool UsesPhysics |
| 275 | { | 275 | { |
| 276 | get { return (RootPart.Flags & PrimFlags.TemporaryOnRez) != 0; } | 276 | get { return (RootPart.Flags & PrimFlags.Physics) != 0; } |
| 277 | } | 277 | } |
| 278 | 278 | ||
| 279 | /// <summary> | 279 | /// <summary> |