diff options
author | Melanie | 2009-10-02 19:53:42 +0100 |
---|---|---|
committer | Melanie | 2009-10-02 19:53:42 +0100 |
commit | 9eccea577716ee4331d30d519da389393b8606cd (patch) | |
tree | 2e3f1ad5892a7e1d1dc0155f1613adab8bcd2690 /OpenSim/Region/OptionalModules/World | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Merge branch 'master' into diva-textures (diff) | |
download | opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.zip opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.gz opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.bz2 opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index f0bdf3b..ac8b98c 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -1101,5 +1101,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
1101 | { | 1101 | { |
1102 | } | 1102 | } |
1103 | #endregion | 1103 | #endregion |
1104 | |||
1105 | public void SendRebakeAvatarTextures(UUID textureID) | ||
1106 | { | ||
1107 | } | ||
1104 | } | 1108 | } |
1105 | } | 1109 | } |
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); |