diff options
| author | Justin Clark-Casey (justincc) | 2012-02-06 20:54:21 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-02-06 20:54:21 +0000 |
| commit | 8a36f54cf41ae3c1809f34dfee4c60058605aa20 (patch) | |
| tree | c05781596c843dae2d6fd670b72628a466df9014 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' into 0.7.3-post-fixes (diff) | |
| parent | Revert my two quick fixes for the lag issue and put in the real fix, which (diff) | |
| download | opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.zip opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.gz opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.bz2 opensim-SC_OLD-8a36f54cf41ae3c1809f34dfee4c60058605aa20.tar.xz | |
Merge branch 'master' into 0.7.3-post-fixes
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index e7f2fdb..8939342 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -2423,9 +2423,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2423 | for (int i = 0; i < parts.Length; i++) | 2423 | for (int i = 0; i < parts.Length; i++) |
| 2424 | { | 2424 | { |
| 2425 | SceneObjectPart part = parts[i]; | 2425 | SceneObjectPart part = parts[i]; |
| 2426 | if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax || | 2426 | if (part.Scale.X > m_scene.m_maxPhys || |
| 2427 | part.Scale.Y > m_scene.RegionInfo.PhysPrimMax || | 2427 | part.Scale.Y > m_scene.m_maxPhys || |
| 2428 | part.Scale.Z > m_scene.RegionInfo.PhysPrimMax) | 2428 | part.Scale.Z > m_scene.m_maxPhys ) |
| 2429 | { | 2429 | { |
| 2430 | UsePhysics = false; // Reset physics | 2430 | UsePhysics = false; // Reset physics |
| 2431 | break; | 2431 | break; |