aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorHomer Horwitz2009-05-05 19:44:19 +0000
committerHomer Horwitz2009-05-05 19:44:19 +0000
commit7e731b024aa5163ece543cdc4fb1d1d2f84d0653 (patch)
treec59ab44bbc329b99c2136358da95574724d81805 /OpenSim/Region/Framework/Scenes
parent* Change automatic properties back to manual get/set (diff)
downloadopensim-SC_OLD-7e731b024aa5163ece543cdc4fb1d1d2f84d0653.zip
opensim-SC_OLD-7e731b024aa5163ece543cdc4fb1d1d2f84d0653.tar.gz
opensim-SC_OLD-7e731b024aa5163ece543cdc4fb1d1d2f84d0653.tar.bz2
opensim-SC_OLD-7e731b024aa5163ece543cdc4fb1d1d2f84d0653.tar.xz
Allow temp-on-rez prims to take part in physics (e.g. temp-on-rez bullets)
This makes re-rezzed temp-on-rez objects visible, too. Fixes Mantis #3405
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6dc331b..99e6e1e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1845,8 +1845,9 @@ namespace OpenSim.Region.Framework.Scenes
1845 if (m_rootPart == null) 1845 if (m_rootPart == null)
1846 return; 1846 return;
1847 1847
1848 if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0) 1848 // Even temporary objects take part in physics (e.g. temp-on-rez bullets)
1849 return; 1849 //if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
1850 // return;
1850 1851
1851 lock (m_parts) 1852 lock (m_parts)
1852 { 1853 {