Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

1 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 8c9c006..b0a29c0 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -116,7 +116,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     return false;
 
             // Delete existing npc attachments
-            scene.AttachmentsModule.DeleteAttachmentsFromScene(npc, false);
+            if(scene.AttachmentsModule != null)
+                scene.AttachmentsModule.DeleteAttachmentsFromScene(npc, false);
 
             // XXX: We can't just use IAvatarFactoryModule.SetAppearance() yet
             // since it doesn't transfer attachments
@@ -125,7 +126,8 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             npc.Appearance = npcAppearance;
 
             // Rez needed npc attachments
-            scene.AttachmentsModule.RezAttachments(npc);
+            if (scene.AttachmentsModule != null)
+                scene.AttachmentsModule.RezAttachments(npc);
 
             IAvatarFactoryModule module =
                     scene.RequestModuleInterface<IAvatarFactoryModule>();