1 files changed, 4 insertions, 1 deletions

diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
index 4524a05..e76e8f2 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
@@ -122,6 +122,9 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             if (!m_floaters.ContainsKey(agentID))
                 m_floaters[agentID] = new Dictionary<int, FloaterData>();
 
+            if (m_floaters[agentID].ContainsKey(dialogData.Channel))
+                return;
+
             m_floaters[agentID].Add(dialogData.Channel, dialogData);
 
             string xml;
@@ -218,7 +221,7 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
                 }
             }
 
-            if (data.Handler(client, data, parts))
+            if (data.Handler != null && data.Handler(client, data, parts))
             {
                 m_floaters[client.AgentId].Remove(data.Channel);
                 SendToClient(sp, String.Format("># floater {0} destroy", data.FloaterName));