diff options
author | Teravus Ovares | 2008-05-25 04:15:32 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-25 04:15:32 +0000 |
commit | 29092d39990d6641a1009c23b18b9374e0b31316 (patch) | |
tree | f11f12f28ea82e68109aceb01fafc4cc188657e6 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | * Yet another way to optimize the sculpt mesh generator (diff) | |
download | opensim-SC_OLD-29092d39990d6641a1009c23b18b9374e0b31316.zip opensim-SC_OLD-29092d39990d6641a1009c23b18b9374e0b31316.tar.gz opensim-SC_OLD-29092d39990d6641a1009c23b18b9374e0b31316.tar.bz2 opensim-SC_OLD-29092d39990d6641a1009c23b18b9374e0b31316.tar.xz |
* phantom sculpties don't request the sculpt texture anymore.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 4484749..4de10c7 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -2522,11 +2522,17 @@ namespace OpenSim.Region.Environment.Scenes | |||
2522 | { | 2522 | { |
2523 | lock (m_parts) | 2523 | lock (m_parts) |
2524 | { | 2524 | { |
2525 | foreach (SceneObjectPart part in m_parts.Values) | 2525 | if (RootPart != null) |
2526 | { | 2526 | { |
2527 | if (part.Shape.SculptEntry && part.Shape.SculptTexture != LLUUID.Zero) | 2527 | if ((RootPart.GetEffectiveObjectFlags() & (uint)LLObject.ObjectFlags.Phantom) == 0) |
2528 | { | 2528 | { |
2529 | m_scene.AssetCache.GetAsset(part.Shape.SculptTexture, part.SculptTextureCallback, true); | 2529 | foreach (SceneObjectPart part in m_parts.Values) |
2530 | { | ||
2531 | if (part.Shape.SculptEntry && part.Shape.SculptTexture != LLUUID.Zero) | ||
2532 | { | ||
2533 | m_scene.AssetCache.GetAsset(part.Shape.SculptTexture, part.SculptTextureCallback, true); | ||
2534 | } | ||
2535 | } | ||
2530 | } | 2536 | } |
2531 | } | 2537 | } |
2532 | } | 2538 | } |