diff options
| author | UbitUmarov | 2017-01-03 11:24:16 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-03 11:24:16 +0000 |
| commit | 82a26671b8e96a4959896759e9ad250924ebedda (patch) | |
| tree | bf6f3ed18113014e2e1db611ebc1fd0c73883658 /OpenSim/Server | |
| parent | some cleanup, use more using(), more checks so http request mem stream is closed (diff) | |
| parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-82a26671b8e96a4959896759e9ad250924ebedda.zip opensim-SC-82a26671b8e96a4959896759e9ad250924ebedda.tar.gz opensim-SC-82a26671b8e96a4959896759e9ad250924ebedda.tar.bz2 opensim-SC-82a26671b8e96a4959896759e9ad250924ebedda.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to 'OpenSim/Server')
| -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 | ||