aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie2012-02-27 08:49:19 +0100
committerMelanie2012-02-27 08:49:19 +0100
commitd342008e5b9ca6d6f0c2bbaac6b946a556adc40e (patch)
treede3b8073581a626162c3eb22cbba9ca0214c1fca /OpenSim/Region
parentMerge branch 'ubitwork' (diff)
downloadopensim-SC_OLD-d342008e5b9ca6d6f0c2bbaac6b946a556adc40e.zip
opensim-SC_OLD-d342008e5b9ca6d6f0c2bbaac6b946a556adc40e.tar.gz
opensim-SC_OLD-d342008e5b9ca6d6f0c2bbaac6b946a556adc40e.tar.bz2
opensim-SC_OLD-d342008e5b9ca6d6f0c2bbaac6b946a556adc40e.tar.xz
Fix NPC appearance setting to include attachments again
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index ae46c97..78e9b29 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -99,8 +99,11 @@ namespace OpenSim.Region.OptionalModules.World.NPC
99 // Delete existing sp attachments 99 // Delete existing sp attachments
100 scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, false); 100 scene.AttachmentsModule.DeleteAttachmentsFromScene(sp, false);
101 101
102 AvatarAppearance app = new AvatarAppearance(appearance, true);
103 sp.Appearance = app;
104
102 // Set new sp appearance. Also sends to clients. 105 // Set new sp appearance. Also sends to clients.
103 scene.RequestModuleInterface<IAvatarFactoryModule>().SetAppearance(sp, new AvatarAppearance(appearance, true)); 106 scene.RequestModuleInterface<IAvatarFactoryModule>().SetAppearance(sp, app);
104 107
105 // Rez needed sp attachments 108 // Rez needed sp attachments
106 scene.AttachmentsModule.RezAttachments(sp); 109 scene.AttachmentsModule.RezAttachments(sp);