diff options
author | John Hurliman | 2009-09-30 15:53:03 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 15:53:03 -0700 |
commit | 5dfd2643dfc530280e5dcd0056b59add7d49f313 (patch) | |
tree | 1e508a2e9be42eda630f0b97c4fac9606a288a7e /OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |
parent | Prevent null data being sent to the decoder (diff) | |
download | opensim-SC_OLD-5dfd2643dfc530280e5dcd0056b59add7d49f313.zip opensim-SC_OLD-5dfd2643dfc530280e5dcd0056b59add7d49f313.tar.gz opensim-SC_OLD-5dfd2643dfc530280e5dcd0056b59add7d49f313.tar.bz2 opensim-SC_OLD-5dfd2643dfc530280e5dcd0056b59add7d49f313.tar.xz |
* Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
Diffstat (limited to 'OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs index b3bfe07..30a2675 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||
@@ -163,13 +163,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
163 | { | 163 | { |
164 | AvatarAppearance x = GetAppearance(p_cloneAppearanceFrom, p_scene); | 164 | AvatarAppearance x = GetAppearance(p_cloneAppearanceFrom, p_scene); |
165 | 165 | ||
166 | List<byte> wearbyte = new List<byte>(); | 166 | sp.SetAppearance(x.Texture, (byte[])x.VisualParams.Clone()); |
167 | for (int i = 0; i < x.VisualParams.Length; i++) | ||
168 | { | ||
169 | wearbyte.Add(x.VisualParams[i]); | ||
170 | } | ||
171 | |||
172 | sp.SetAppearance(x.Texture.GetBytes(), wearbyte); | ||
173 | } | 167 | } |
174 | 168 | ||
175 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); | 169 | m_avatars.Add(npcAvatar.AgentId, npcAvatar); |