Update svn properties.
parent
313f7f60fd
commit
2dfaa3c5e4
|
@ -1,21 +1,21 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
|
|
||||||
namespace OpenSim.Framework.Communications
|
namespace OpenSim.Framework.Communications
|
||||||
{
|
{
|
||||||
public interface IAvatarService
|
public interface IAvatarService
|
||||||
{
|
{
|
||||||
/// Get's the User Appearance
|
/// Get's the User Appearance
|
||||||
AvatarAppearance GetUserAppearance(LLUUID user);
|
AvatarAppearance GetUserAppearance(LLUUID user);
|
||||||
|
|
||||||
void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
|
void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
|
||||||
|
|
||||||
void AddAttachment(LLUUID user, LLUUID attach);
|
void AddAttachment(LLUUID user, LLUUID attach);
|
||||||
|
|
||||||
void RemoveAttachment(LLUUID user, LLUUID attach);
|
void RemoveAttachment(LLUUID user, LLUUID attach);
|
||||||
|
|
||||||
List<LLUUID> GetAttachments(LLUUID user);
|
List<LLUUID> GetAttachments(LLUUID user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,114 +1,114 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
* Copyright (c) Contributors, http://opensimulator.org/
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
* modification, are permitted provided that the following conditions are met:
|
* modification, are permitted provided that the following conditions are met:
|
||||||
* * Redistributions of source code must retain the above copyright
|
* * Redistributions of source code must retain the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer.
|
* notice, this list of conditions and the following disclaimer.
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
* documentation and/or other materials provided with the distribution.
|
* documentation and/or other materials provided with the distribution.
|
||||||
* * Neither the name of the OpenSim Project nor the
|
* * Neither the name of the OpenSim Project nor the
|
||||||
* names of its contributors may be used to endorse or promote products
|
* names of its contributors may be used to endorse or promote products
|
||||||
* derived from this software without specific prior written permission.
|
* derived from this software without specific prior written permission.
|
||||||
*
|
*
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
* 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
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using log4net;
|
using log4net;
|
||||||
using Mono.Addins;
|
using Mono.Addins;
|
||||||
|
|
||||||
namespace OpenSim.Framework
|
namespace OpenSim.Framework
|
||||||
{
|
{
|
||||||
public class PluginLoader <T> : IDisposable where T : IPlugin
|
public class PluginLoader <T> : IDisposable where T : IPlugin
|
||||||
{
|
{
|
||||||
private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
private static readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
|
||||||
private List<T> loaded = new List<T>();
|
private List<T> loaded = new List<T>();
|
||||||
|
|
||||||
public PluginLoader (string dir)
|
public PluginLoader (string dir)
|
||||||
{
|
{
|
||||||
AddPluginDir (dir);
|
AddPluginDir (dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddPluginDir (string dir)
|
public void AddPluginDir (string dir)
|
||||||
{
|
{
|
||||||
suppress_console_output_ (true);
|
suppress_console_output_ (true);
|
||||||
AddinManager.Initialize (dir);
|
AddinManager.Initialize (dir);
|
||||||
AddinManager.Registry.Update (null);
|
AddinManager.Registry.Update (null);
|
||||||
suppress_console_output_ (false);
|
suppress_console_output_ (false);
|
||||||
}
|
}
|
||||||
|
|
||||||
public delegate void Initialiser (IPlugin p);
|
public delegate void Initialiser (IPlugin p);
|
||||||
private void default_initialiser_ (IPlugin p) { p.Initialise(); }
|
private void default_initialiser_ (IPlugin p) { p.Initialise(); }
|
||||||
|
|
||||||
public void Load (string extpoint)
|
public void Load (string extpoint)
|
||||||
{
|
{
|
||||||
Load (extpoint, default_initialiser_);
|
Load (extpoint, default_initialiser_);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Load (string extpoint, Initialiser initialize)
|
public void Load (string extpoint, Initialiser initialize)
|
||||||
{
|
{
|
||||||
ExtensionNodeList ns = AddinManager.GetExtensionNodes(extpoint);
|
ExtensionNodeList ns = AddinManager.GetExtensionNodes(extpoint);
|
||||||
foreach (TypeExtensionNode n in ns)
|
foreach (TypeExtensionNode n in ns)
|
||||||
{
|
{
|
||||||
T p = (T) n.CreateInstance();
|
T p = (T) n.CreateInstance();
|
||||||
initialize (p);
|
initialize (p);
|
||||||
Plugins.Add (p);
|
Plugins.Add (p);
|
||||||
|
|
||||||
log.Info("[PLUGINS]: Loading plugin " + n.Path + "/" + p.Name);
|
log.Info("[PLUGINS]: Loading plugin " + n.Path + "/" + p.Name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<T> Plugins
|
public List<T> Plugins
|
||||||
{
|
{
|
||||||
get { return loaded; }
|
get { return loaded; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Dispose ()
|
public void Dispose ()
|
||||||
{
|
{
|
||||||
foreach (T p in Plugins)
|
foreach (T p in Plugins)
|
||||||
p.Dispose ();
|
p.Dispose ();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ClearCache()
|
public void ClearCache()
|
||||||
{
|
{
|
||||||
// The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) occasionally seems to corrupt its addin cache
|
// The Mono addin manager (in Mono.Addins.dll version 0.2.0.0) occasionally seems to corrupt its addin cache
|
||||||
// Hence, as a temporary solution we'll remove it before each startup
|
// Hence, as a temporary solution we'll remove it before each startup
|
||||||
if (Directory.Exists("addin-db-000"))
|
if (Directory.Exists("addin-db-000"))
|
||||||
Directory.Delete("addin-db-000", true);
|
Directory.Delete("addin-db-000", true);
|
||||||
|
|
||||||
if (Directory.Exists("addin-db-001"))
|
if (Directory.Exists("addin-db-001"))
|
||||||
Directory.Delete("addin-db-001", true);
|
Directory.Delete("addin-db-001", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TextWriter prev_console_;
|
private static TextWriter prev_console_;
|
||||||
public void suppress_console_output_ (bool save)
|
public void suppress_console_output_ (bool save)
|
||||||
{
|
{
|
||||||
if (save)
|
if (save)
|
||||||
{
|
{
|
||||||
prev_console_ = System.Console.Out;
|
prev_console_ = System.Console.Out;
|
||||||
System.Console.SetOut(new StreamWriter(Stream.Null));
|
System.Console.SetOut(new StreamWriter(Stream.Null));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (prev_console_ != null)
|
if (prev_console_ != null)
|
||||||
System.Console.SetOut(prev_console_);
|
System.Console.SetOut(prev_console_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue