1 files changed, 29 insertions, 67 deletions

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index a5d28a4..a399672 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -34,55 +34,13 @@ using System.Text;
 using System.Collections.Generic;
 using log4net;
 using OpenSim.Framework;
+using OpenMetaverse;
 
 namespace OpenSim.Server.Base
 {
     public static class ServerUtils
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        public static string SLAssetTypeToContentType(int assetType)
-        {
-            switch (assetType)
-            {
-                case 0:
-                    return "image/jp2";
-                case 1:
-                    return "application/ogg";
-                case 2:
-                    return "application/x-metaverse-callingcard";
-                case 3:
-                    return "application/x-metaverse-landmark";
-                case 5:
-                    return "application/x-metaverse-clothing";
-                case 6:
-                    return "application/x-metaverse-primitive";
-                case 7:
-                    return "application/x-metaverse-notecard";
-                case 8:
-                    return "application/x-metaverse-folder";
-                case 10:
-                    return "application/x-metaverse-lsl";
-                case 11:
-                    return "application/x-metaverse-lso";
-                case 12:
-                    return "image/tga";
-                case 13:
-                    return "application/x-metaverse-bodypart";
-                case 17:
-                    return "audio/x-wav";
-                case 19:
-                    return "image/jpeg";
-                case 20:
-                    return "application/x-metaverse-animation";
-                case 21:
-                    return "application/x-metaverse-gesture";
-                case 22:
-                    return "application/x-metaverse-simstate";
-                default:
-                    return "application/octet-stream";
-            }
-        }
 
         public static  byte[] SerializeResult(XmlSerializer xs, object data)
         {
@@ -99,6 +57,12 @@ namespace OpenSim.Server.Base
             return ret;
         }
 
+        /// <summary>
+        /// Load a plugin from a dll with the given class or interface
+        /// </summary>
+        /// <param name="dllName"></param>
+        /// <param name="args">The arguments which control which constructor is invoked on the plugin</param>
+        /// <returns></returns>        
         public static T LoadPlugin<T>(string dllName, Object[] args) where T:class
         {
             string[] parts = dllName.Split(new char[] {':'});
@@ -113,6 +77,13 @@ namespace OpenSim.Server.Base
             return LoadPlugin<T>(dllName, className, args);
         }
 
+        /// <summary>
+        /// Load a plugin from a dll with the given class or interface
+        /// </summary>
+        /// <param name="dllName"></param>
+        /// <param name="className"></param>
+        /// <param name="args">The arguments which control which constructor is invoked on the plugin</param>
+        /// <returns></returns>
         public static T LoadPlugin<T>(string dllName, string className, Object[] args) where T:class
         {
             string interfaceName = typeof(T).ToString();
@@ -125,28 +96,15 @@ namespace OpenSim.Server.Base
                 {
                     if (pluginType.IsPublic)
                     {
-                        if (className != String.Empty &&
-                                pluginType.ToString() !=
-                                pluginType.Namespace + "." + className)
+                        if (className != String.Empty 
+                            && pluginType.ToString() != pluginType.Namespace + "." + className)
                             continue;
-                        Type typeInterface =
-                                pluginType.GetInterface(interfaceName, true);
+                        
+                        Type typeInterface = pluginType.GetInterface(interfaceName, true);
+                        
                         if (typeInterface != null)
                         {
-                            T plug = null;
-                            try
-                            {
-                                plug = (T)Activator.CreateInstance(pluginType,
-                                        args);
-                            }
-                            catch (Exception e)
-                            {
-                                if (!(e is System.MissingMethodException))
-                                    m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
-                                return null;
-                            }
-
-                            return plug;
+                            return (T)Activator.CreateInstance(pluginType, args);
                         }
                     }
                 }
@@ -155,7 +113,7 @@ namespace OpenSim.Server.Base
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e);
+                m_log.Error(string.Format("Error loading plugin from {0}", dllName), e);
                 return null;
             }
         }
@@ -182,12 +140,13 @@ namespace OpenSim.Server.Base
 
                 if (name.EndsWith("[]"))
                 {
-                    if (result.ContainsKey(name))
+                    string cleanName = name.Substring(0, name.Length - 2);
+                    if (result.ContainsKey(cleanName))
                     {
-                        if (!(result[name] is List<string>))
+                        if (!(result[cleanName] is List<string>))
                             continue;
 
-                        List<string> l = (List<string>)result[name];
+                        List<string> l = (List<string>)result[cleanName];
 
                         l.Add(value);
                     }
@@ -197,7 +156,7 @@ namespace OpenSim.Server.Base
 
                         newList.Add(value);
 
-                        result[name] = newList;
+                        result[cleanName] = newList;
                     }
                 }
                 else
@@ -278,6 +237,9 @@ namespace OpenSim.Server.Base
         {
             foreach (KeyValuePair<string, object> kvp in data)
             {
+                if (kvp.Value == null)
+                    continue;
+
                 XmlElement elem = parent.OwnerDocument.CreateElement("",
                         kvp.Key, "");