diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
index 9cc1d4c382..31af44cd8e 100644
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -786,7 +786,7 @@ namespace OpenSim.Framework.Servers.HttpServer
requestStream.Close();
//m_log.Debug(requestBody);
requestBody = requestBody.Replace("", "");
- string responseString = null;
+ string responseString = String.Empty;
XmlRpcRequest xmlRprcRequest = null;
try
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index f1deaa8068..c05ef3cdc7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -631,6 +631,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
{
m_scene.SendKillObject(new List { so.RootPart.LocalId });
}
+ else if (so.HasPrivateAttachmentPoint)
+ {
+// m_log.DebugFormat(
+// "[ATTACHMENTS MODULE]: Killing private HUD {0} for avatars other than {1} at attachment point {2}",
+// so.Name, sp.Name, so.AttachmentPoint);
+
+ // As this scene object can now only be seen by the attaching avatar, tell everybody else in the
+ // scene that it's no longer in their awareness.
+ m_scene.ForEachClient(
+ client =>
+ { if (client.AgentId != so.AttachedAvatar)
+ client.SendKillObject(m_scene.RegionInfo.RegionHandle, new List() { so.LocalId });
+ });
+ }
so.IsSelected = false; // fudge....
so.ScheduleGroupForFullUpdate();