diff options
author | Melanie | 2012-03-04 16:23:46 +0000 |
---|---|---|
committer | Melanie | 2012-03-04 16:23:46 +0000 |
commit | 182f5efbe94881c22af82bc71566c49dd02ed8f8 (patch) | |
tree | 2b26c2657cfb91464008d8e305566500bc3cdd9e /OpenSim/Region/OptionalModules | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Zero velocity when drag-copying (diff) | |
download | opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.zip opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.gz opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.bz2 opensim-SC_OLD-182f5efbe94881c22af82bc71566c49dd02ed8f8.tar.xz |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 5 |
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); |