OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Committing fix for previous build breakage. Sorry! 

* Committing namespace/usings fixes for ThirdParty directory, missed in previous commit.
0.6.0-stable
Adam Frisby 2008-04-21 07:16:30 +00:00
parent fef3b36894
commit 01663cb612
5 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
View File

@ -32,8 +32,8 @@ using OpenSim.Region.Environment.Interfaces;
using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase; using OpenSim.Region.ScriptEngine.Common.ScriptEngineBase;
using integer = System.Int32; using integer = System.Int32;
using key = System.String; using key = System.String;
using vector = ScriptEngine.Common.LSL_Types.Vector3; using vector = OpenSim.Region.ScriptEngine.Common.LSL_Types.Vector3;
using rotation = Quaternion; using rotation = OpenSim.Region.ScriptEngine.Common.LSL_Types.Quaternion;
namespace OpenSim.Region.ScriptEngine.Common namespace OpenSim.Region.ScriptEngine.Common
{ {

32
ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs vendored
View File

@ -26,31 +26,21 @@
*/ */
using System; using System;
using System.IO;
using System.Net;
using System.Xml;
using System.Text;
using System.Xml.Serialization;
using System.Net.Sockets;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.IO;
using System.Net;
using System.Reflection;
using System.Threading; using System.Threading;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Framework.Servers;
using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes;
using OpenSim.Region.ClientStack;
using Nwc.XmlRpc;
using Nini.Config;
using Mono.Addins;
using libsecondlife; using libsecondlife;
using libsecondlife.Packets; using libsecondlife.Packets;
using log4net;
using Mono.Addins;
using Nwc.XmlRpc;
using OpenSim.Framework;
using OpenSim.Framework.Servers;
using OpenSim.Region.ClientStack;
using OpenSim.Region.Environment.Scenes;
[assembly:Addin] [assembly:Addin]
[assembly:AddinDependency ("OpenSim", "0.5")] [assembly:AddinDependency ("OpenSim", "0.5")]
@ -61,7 +51,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer
[Extension("/OpenSim/Startup")] [Extension("/OpenSim/Startup")]
public class LoadBalancerPlugin : IApplicationPlugin public class LoadBalancerPlugin : IApplicationPlugin
{ {
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private OpenSimMain simMain; private OpenSimMain simMain;
private BaseHttpServer commandServer; private BaseHttpServer commandServer;

3
ThirdParty/3Di/LoadBalancer/TcpClient.cs vendored
View File

@ -26,12 +26,9 @@
*/ */
using System; using System;
using System.IO;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using System.Text;
using System.Runtime.Serialization.Formatters.Binary;
namespace OpenSim.ApplicationPlugins.LoadBalancer { namespace OpenSim.ApplicationPlugins.LoadBalancer {
public class AsynchronousClient { public class AsynchronousClient {

4
ThirdParty/3Di/LoadBalancer/TcpServer.cs vendored
View File

@ -29,11 +29,7 @@ using System;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Text;
using System.Threading; using System.Threading;
using System.Runtime.Serialization.Formatters.Binary;
using OpenSim.Framework.Console;
namespace OpenSim.ApplicationPlugins.LoadBalancer { namespace OpenSim.ApplicationPlugins.LoadBalancer {

24
ThirdParty/3Di/RegionProxy/RegionProxyPlugin.cs vendored
View File

@ -26,22 +26,16 @@
*/ */
using System; using System;
using System.IO;
using System.Net;
using System.Xml;
using System.Text;
using System.Xml.Serialization;
using System.Net.Sockets;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Net;
using System.Net.Sockets;
using System.Reflection;
using log4net;
using Mono.Addins;
using Nwc.XmlRpc;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Framework.Console;
using Nwc.XmlRpc;
using Mono.Addins;
[assembly:Addin ("RegionProxy", "0.1")] [assembly:Addin ("RegionProxy", "0.1")]
[assembly:AddinDependency ("OpenSim", "0.5")] [assembly:AddinDependency ("OpenSim", "0.5")]
@ -71,7 +65,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
{ {
private ProxyServer proxy; private ProxyServer proxy;
private BaseHttpServer command_server; private BaseHttpServer command_server;
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public void Initialise(OpenSimMain openSim) public void Initialise(OpenSimMain openSim)
{ {
@ -199,7 +193,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
public class ProxyServer { public class ProxyServer {
protected AsyncCallback receivedData; protected AsyncCallback receivedData;
protected ProxyMap proxy_map = new ProxyMap(); protected ProxyMap proxy_map = new ProxyMap();
protected readonly log4net.ILog m_log; protected readonly ILog m_log;
protected bool running; protected bool running;
protected class ProxyMap protected class ProxyMap
@ -279,7 +273,7 @@ namespace OpenSim.ApplicationPlugins.RegionProxy
} }
} }
public ProxyServer(log4net.ILog log) public ProxyServer(ILog log)
{ {
m_log = log; m_log = log;
running=false; running=false;