Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Framework/DOMap.cs b/OpenSim/Framework/DOMap.cs
index 755e129..f5b650b 100644
--- a/OpenSim/Framework/DOMap.cs
+++ b/OpenSim/Framework/DOMap.cs
@@ -42,22 +42,22 @@ namespace OpenSim.Framework
     /// This class stores and retrieves dynamic objects.
     /// </summary>
     /// <remarks>
-    /// Experimental - DO NOT USE.
+    /// Experimental - DO NOT USE.  Does not yet have namespace support.
     /// </remarks>
     public class DOMap
     {
         private IDictionary<string, object> m_map;
         
-        public void Add(string key, object dynObj)
+        public void Add(string ns, string objName, object dynObj)
         {
-            DAMap.ValidateKey(key);
+            DAMap.ValidateNamespace(ns);
 
             lock (this)
             {
                 if (m_map == null)
                     m_map = new Dictionary<string, object>();
 
-                m_map.Add(key, dynObj);
+                m_map.Add(objName, dynObj);
             }
         }