diff options
| author | Melanie Thielker | 2017-01-02 19:31:23 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-02 19:31:23 +0000 |
| commit | 65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5 (patch) | |
| tree | 4e7b0bd4c8d7e3991b5615ebd7433cd1ce5cbd33 /OpenSim/Server/Base/ServerUtils.cs | |
| parent | Add the HGRemoteAssetService. Allows to use any asset service with HG (diff) | |
| parent | Create a generic way for passing constructor args to plugins (diff) | |
| download | opensim-SC-65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5.zip opensim-SC-65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5.tar.gz opensim-SC-65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5.tar.bz2 opensim-SC-65dfb62b74b99edb5c1c74d1f19a3b29f94ed8b5.tar.xz | |
Merge branch 'master' of opensimulator.org:/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 12 |
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 | |||
| 242 | className = parts[2]; | 242 | className = parts[2]; |
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | // Handle extra string arguments in a more generic way | ||
| 246 | if (dllName.Contains("@")) | ||
| 247 | { | ||
| 248 | string[] dllNameParts = dllName.Split(new char[] {'@'}); | ||
| 249 | dllName = dllNameParts[dllNameParts.Length - 1]; | ||
| 250 | List<Object> argList = new List<Object>(args); | ||
| 251 | for (int i = 0 ; i < dllNameParts.Length - 1 ; ++i) | ||
| 252 | argList.Add(dllNameParts[i]); | ||
| 253 | |||
| 254 | args = argList.ToArray(); | ||
| 255 | } | ||
| 256 | |||
| 245 | return LoadPlugin<T>(dllName, className, args); | 257 | return LoadPlugin<T>(dllName, className, args); |
| 246 | } | 258 | } |
| 247 | 259 | ||