From f58a0394edf3c0e4d46faf1f3053b940ba0a1c8c Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 10 Mar 2010 13:15:36 +0900
Subject: Formatting cleanup. Add copyright notices.
---
.../Handlers/Hypergrid/UserAgentServerConnector.cs | 29 +++++++++++++++++++++-
.../Handlers/Inventory/XInventoryInConnector.cs | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Server')
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
index 79c6b2a..6b1152b 100644
--- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
+++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs
@@ -1,4 +1,31 @@
-using System;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
using System.Collections;
using System.Collections.Generic;
using System.Net;
diff --git a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
index f9db859..34f7dcc 100644
--- a/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
+++ b/OpenSim/Server/Handlers/Inventory/XInventoryInConnector.cs
@@ -289,7 +289,7 @@ namespace OpenSim.Server.Handlers.Asset
foreach (InventoryItemBase i in icoll.Items)
items[i.ID.ToString()] = EncodeItem(i);
result["ITEMS"] = items;
- }
+ }
string xmlString = ServerUtils.BuildXmlResponse(result);
m_log.DebugFormat("[XXX]: resp string: {0}", xmlString);
--
cgit v1.1
From f2de50bb14bd8215ea98c79c79aabe1e6b4f2780 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 12 Mar 2010 19:31:14 +0000
Subject: Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12 Adds
MockUserAccountService and connects it up Stops services being carried over
between tests since this leads to hard to find bugs Improves information and
error reporting when loading plugins
---
OpenSim/Server/Base/ServerUtils.cs | 40 +++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 20 deletions(-)
(limited to 'OpenSim/Server')
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 9c54410..a399672 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -57,6 +57,12 @@ namespace OpenSim.Server.Base
return ret;
}
+ ///
+ /// Load a plugin from a dll with the given class or interface
+ ///
+ ///
+ /// The arguments which control which constructor is invoked on the plugin
+ ///
public static T LoadPlugin(string dllName, Object[] args) where T:class
{
string[] parts = dllName.Split(new char[] {':'});
@@ -71,6 +77,13 @@ namespace OpenSim.Server.Base
return LoadPlugin(dllName, className, args);
}
+ ///
+ /// Load a plugin from a dll with the given class or interface
+ ///
+ ///
+ ///
+ /// The arguments which control which constructor is invoked on the plugin
+ ///
public static T LoadPlugin(string dllName, string className, Object[] args) where T:class
{
string interfaceName = typeof(T).ToString();
@@ -83,28 +96,15 @@ namespace OpenSim.Server.Base
{
if (pluginType.IsPublic)
{
- if (className != String.Empty &&
- pluginType.ToString() !=
- pluginType.Namespace + "." + className)
+ if (className != String.Empty
+ && pluginType.ToString() != pluginType.Namespace + "." + className)
continue;
- Type typeInterface =
- pluginType.GetInterface(interfaceName, true);
+
+ Type typeInterface = pluginType.GetInterface(interfaceName, true);
+
if (typeInterface != null)
{
- T plug = null;
- try
- {
- plug = (T)Activator.CreateInstance(pluginType,
- args);
- }
- catch (Exception e)
- {
- if (!(e is System.MissingMethodException))
- m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException);
- return null;
- }
-
- return plug;
+ return (T)Activator.CreateInstance(pluginType, args);
}
}
}
@@ -113,7 +113,7 @@ namespace OpenSim.Server.Base
}
catch (Exception e)
{
- m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e);
+ m_log.Error(string.Format("Error loading plugin from {0}", dllName), e);
return null;
}
}
--
cgit v1.1