diff options
Diffstat (limited to 'OpenSim/Region/OptionalModules')
3 files changed, 10 insertions, 13 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 605645b..ee2d2db 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -861,12 +861,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
861 | Scene scene = (Scene)Scene; | 861 | Scene scene = (Scene)Scene; |
862 | AvatarAppearance appearance; | 862 | AvatarAppearance appearance; |
863 | scene.GetAvatarAppearance(this, out appearance); | 863 | scene.GetAvatarAppearance(this, out appearance); |
864 | List<byte> visualParams = new List<byte>(); | 864 | OnSetAppearance(appearance.Texture, (byte[])appearance.VisualParams.Clone()); |
865 | foreach (byte visualParam in appearance.VisualParams) | ||
866 | { | ||
867 | visualParams.Add(visualParam); | ||
868 | } | ||
869 | OnSetAppearance(appearance.Texture.GetBytes(), visualParams); | ||
870 | } | 865 | } |
871 | 866 | ||
872 | public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) | 867 | public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args) |
@@ -1609,5 +1604,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1609 | } | 1604 | } |
1610 | 1605 | ||
1611 | #endregion | 1606 | #endregion |
1607 | |||
1608 | public void SendRebakeAvatarTextures(UUID textureID) | ||
1609 | { | ||
1610 | } | ||
1612 | } | 1611 | } |
1613 | } | 1612 | } |
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); |