OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* phantom sculpties don't request the sculpt texture anymore.

0.6.0-stable
Teravus Ovares 2008-05-25 04:15:32 +00:00
parent c29409dc24
commit 29092d3999
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@ -2522,11 +2522,17 @@ namespace OpenSim.Region.Environment.Scenes
{ {
lock (m_parts) lock (m_parts)
{ {
foreach (SceneObjectPart part in m_parts.Values) if (RootPart != null)
{ {
if (part.Shape.SculptEntry && part.Shape.SculptTexture != LLUUID.Zero) if ((RootPart.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Phantom) == 0)
{ {
m_scene.AssetCache.GetAsset(part.Shape.SculptTexture, part.SculptTextureCallback, true); foreach (SceneObjectPart part in m_parts.Values)
{
if (part.Shape.SculptEntry && part.Shape.SculptTexture != LLUUID.Zero)
{
m_scene.AssetCache.GetAsset(part.Shape.SculptTexture, part.SculptTextureCallback, true);
}
}
} }
} }
} }

30
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -1786,6 +1786,16 @@ namespace OpenSim.Region.Environment.Scenes
if (!wasUsingPhysics) if (!wasUsingPhysics)
{ {
DoPhysicsPropertyUpdate(usePhysics, false); DoPhysicsPropertyUpdate(usePhysics, false);
if (m_parentGroup != null)
{
if (m_parentGroup.RootPart != null)
{
if (LocalId == m_parentGroup.RootPart.LocalId)
{
m_parentGroup.CheckSculptAndLoad();
}
}
}
} }
} }
else else
@ -1826,12 +1836,32 @@ namespace OpenSim.Region.Environment.Scenes
{ {
PhysActor.LocalID = LocalId; PhysActor.LocalID = LocalId;
DoPhysicsPropertyUpdate(usePhysics, true); DoPhysicsPropertyUpdate(usePhysics, true);
if (m_parentGroup != null)
{
if (m_parentGroup.RootPart != null)
{
if (LocalId == m_parentGroup.RootPart.LocalId)
{
m_parentGroup.CheckSculptAndLoad();
}
}
}
} }
} }
else else
{ {
PhysActor.IsPhysical = usePhysics; PhysActor.IsPhysical = usePhysics;
DoPhysicsPropertyUpdate(usePhysics, false); DoPhysicsPropertyUpdate(usePhysics, false);
if (m_parentGroup != null)
{
if (m_parentGroup.RootPart != null)
{
if (LocalId == m_parentGroup.RootPart.LocalId)
{
m_parentGroup.CheckSculptAndLoad();
}
}
}
} }
} }