1 files changed, 12 insertions, 0 deletions

diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 18a4266..57d0a8d 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -242,6 +242,18 @@ namespace OpenSim.Server.Base
                     className = parts[2];
             }
 
+                        // Handle extra string arguments in a more generic way
+                        if (dllName.Contains("@"))
+                        {
+                                string[] dllNameParts = dllName.Split(new char[] {'@'});
+                                dllName = dllNameParts[dllNameParts.Length - 1];
+                                List<Object> argList = new List<Object>(args);
+                                for (int i = 0 ; i < dllNameParts.Length - 1 ; ++i)
+                                        argList.Add(dllNameParts[i]);
+
+                                args = argList.ToArray();
+                        }
+
             return LoadPlugin<T>(dllName, className, args);
         }