diff options
author | Justin Clark-Casey (justincc) | 2011-07-12 02:33:09 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-07-12 02:33:09 +0100 |
commit | df0e5cc9fe9b0851ae5442bdeeb49ab7778d5fe1 (patch) | |
tree | 1435bbc275609382086cd57c905b85f4bac67cb2 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Fix permissions problem where newly uploaded meshes rezzed from inventory cou... (diff) | |
download | opensim-SC_OLD-df0e5cc9fe9b0851ae5442bdeeb49ab7778d5fe1.zip opensim-SC_OLD-df0e5cc9fe9b0851ae5442bdeeb49ab7778d5fe1.tar.gz opensim-SC_OLD-df0e5cc9fe9b0851ae5442bdeeb49ab7778d5fe1.tar.bz2 opensim-SC_OLD-df0e5cc9fe9b0851ae5442bdeeb49ab7778d5fe1.tar.xz |
When a mesh object is added to a scene, delay adding the physics actor until the sculpt data has been added to the shape (possibly via an async asset service request)
This prevents spurious 'no asset data' for meshes added on startup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 8195a0d..0104a96 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1751,8 +1751,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1751 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); | 1751 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
1752 | rootPart.Flags &= ~PrimFlags.Scripted; | 1752 | rootPart.Flags &= ~PrimFlags.Scripted; |
1753 | rootPart.TrimPermissions(); | 1753 | rootPart.TrimPermissions(); |
1754 | group.CheckSculptAndLoad(); | 1754 | |
1755 | //rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); | 1755 | // Don't do this here - it will get done later on when sculpt data is loaded. |
1756 | // group.CheckSculptAndLoad(); | ||
1756 | } | 1757 | } |
1757 | 1758 | ||
1758 | m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); | 1759 | m_log.Info("[SCENE]: Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); |