diff options
| author | Melanie | 2010-09-13 16:16:40 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-13 16:17:38 +0100 |
| commit | 6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e (patch) | |
| tree | 1e7bf4fddcf559886c6b2babf13cf4b2ca8829a1 /OpenSim/Server/Base | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... (diff) | |
| parent | Fix unit test SceneSetupHelpers to load the mock simulation data store (diff) | |
| download | opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.zip opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.gz opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.bz2 opensim-SC-6a1ce17cdbf143f11262e1194b6a6d9e5bb1077e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
Diffstat (limited to 'OpenSim/Server/Base')
| -rw-r--r-- | OpenSim/Server/Base/ServerUtils.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs index e7a8294..f4472c7 100644 --- a/OpenSim/Server/Base/ServerUtils.cs +++ b/OpenSim/Server/Base/ServerUtils.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Server.Base | |||
| 62 | /// </summary> | 62 | /// </summary> |
| 63 | /// <param name="dllName"></param> | 63 | /// <param name="dllName"></param> |
| 64 | /// <param name="args">The arguments which control which constructor is invoked on the plugin</param> | 64 | /// <param name="args">The arguments which control which constructor is invoked on the plugin</param> |
| 65 | /// <returns></returns> | 65 | /// <returns></returns> |
| 66 | public static T LoadPlugin<T>(string dllName, Object[] args) where T:class | 66 | public static T LoadPlugin<T>(string dllName, Object[] args) where T:class |
| 67 | { | 67 | { |
| 68 | string[] parts = dllName.Split(new char[] {':'}); | 68 | string[] parts = dllName.Split(new char[] {':'}); |