diff options
author | John Hurliman | 2010-02-22 14:10:19 -0800 |
---|---|---|
committer | John Hurliman | 2010-02-22 14:10:19 -0800 |
commit | 71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch) | |
tree | cca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Services/Base | |
parent | * Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff) | |
parent | Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff) | |
download | opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2 opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz |
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Services/Base')
-rw-r--r-- | OpenSim/Services/Base/ServiceBase.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs index 6bbe978..8e24d85 100644 --- a/OpenSim/Services/Base/ServiceBase.cs +++ b/OpenSim/Services/Base/ServiceBase.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Services.Base | |||
64 | foreach (Type pluginType in pluginAssembly.GetTypes()) | 64 | foreach (Type pluginType in pluginAssembly.GetTypes()) |
65 | { | 65 | { |
66 | if (pluginType.IsPublic) | 66 | if (pluginType.IsPublic) |
67 | { | 67 | { |
68 | if (className != String.Empty && | 68 | if (className != String.Empty && |
69 | pluginType.ToString() != | 69 | pluginType.ToString() != |
70 | pluginType.Namespace + "." + className) | 70 | pluginType.Namespace + "." + className) |
@@ -84,8 +84,9 @@ namespace OpenSim.Services.Base | |||
84 | 84 | ||
85 | return null; | 85 | return null; |
86 | } | 86 | } |
87 | catch (Exception) | 87 | catch (Exception e) |
88 | { | 88 | { |
89 | Console.WriteLine("XXX Exception " + e.StackTrace); | ||
89 | return null; | 90 | return null; |
90 | } | 91 | } |
91 | } | 92 | } |