* Refactored Environment/Modules directory - modules now reside in their own directory with any associated module-specific classes.

* Each module directory is currently inside one of the following category folders: Agent (Anything relating to do with Client<->Server communications.), Avatar (Anything to do with the avatar or presence inworld), Framework (Classes modules can use), Grid (Grid traffic, new OGS2 grid comms), Scripting (Scripting functions, etc), World (The enrivonment/scene, IE Sun/Tree modules.)
* This should be moved into a seperate project file.

1 files changed, 0 insertions, 174 deletions

diff --git a/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs b/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs
deleted file mode 100644
index 8d040c4..0000000
--- a/OpenSim/Region/Environment/Modules/Communications/Interregion/InterregionModule.cs
+++ /dev/null
@@ -1,174 +0,0 @@
-using System;

-using System.Collections.Generic;

-using System.Runtime.Remoting;

-using System.Runtime.Remoting.Channels;

-using System.Runtime.Remoting.Channels.Tcp;

-using Nini.Config;

-using OpenSim.Framework;

-using OpenSim.Region.Environment.Interfaces;

-using OpenSim.Region.Environment.Scenes;

-

-namespace OpenSim.Region.Environment.Modules.Communications.Interregion

-{

-    public class InterregionModule : IInterregionModule, IRegionModule

-    {

-        #region Direction enum

-

-        public enum Direction

-        {

-            North,

-            NorthEast,

-            East,

-            SouthEast,

-            South,

-            SouthWest,

-            West,

-            NorthWest

-        }

-

-        #endregion

-

-        private readonly Dictionary<Type, Object> m_interfaces = new Dictionary<Type, object>();

-        private readonly List<Location> m_myLocations = new List<Location>();

-

-        private readonly Dictionary<Location, string[]> m_neighbourInterfaces = new Dictionary<Location, string[]>();

-        private readonly Dictionary<Location, RemotingObject> m_neighbourRemote = new Dictionary<Location, RemotingObject>();

-        private IConfigSource m_config;

-        private RemotingObject m_myRemote;

-

-        private Object m_lockObject = new object();

-        private TcpChannel m_tcpChannel;

-        private int m_tcpPort = 10101;

-        private bool m_enabled = false;

-

-        #region IRegionModule Members

-

-        //TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated.

-        public void Initialise(Scene scene, IConfigSource source)

-        {

-            if (m_enabled)

-            {

-                m_myLocations.Add(new Location((int) scene.RegionInfo.RegionLocX,

-                                               (int) scene.RegionInfo.RegionLocY));

-                m_config = source;

-

-                scene.RegisterModuleInterface<IInterregionModule>(this);

-            }

-        }

-

-        //TODO: This prevents us from registering new scenes after PostInitialise if we want comms updated.

-        public void PostInitialise()

-        {

-            if (m_enabled)

-            {

-                try

-                {

-                    m_tcpPort = m_config.Configs["Comms"].GetInt("remoting_port", m_tcpPort);

-                }

-                catch

-                {

-                }

-

-                internal_CreateRemotingObjects();

-            }

-        }

-

-        public void Close()

-        {

-            ChannelServices.UnregisterChannel(m_tcpChannel);

-        }

-

-        public string Name

-        {

-            get { return "InterregionModule"; }

-        }

-

-        public bool IsSharedModule

-        {

-            get { return true; }

-        }

-

-        #endregion

-

-        public void internal_CreateRemotingObjects()

-        {

-            lock (m_lockObject)

-            {

-                if (m_tcpChannel == null)

-                {

-                    m_myRemote = new RemotingObject(m_interfaces, m_myLocations.ToArray());

-                    m_tcpChannel = new TcpChannel(m_tcpPort);

-

-                    ChannelServices.RegisterChannel(m_tcpChannel, false);

-                    RemotingServices.Marshal(m_myRemote, "OpenSimRemote2", typeof (RemotingObject));

-                }

-            }

-        }

-

-        public void RegisterRemoteRegion(string uri)

-        {

-            RegisterRemotingInterface((RemotingObject) Activator.GetObject(typeof (RemotingObject), uri));

-        }

-

-        private void RegisterRemotingInterface(RemotingObject remote)

-        {

-            Location[] locs = remote.GetLocations();

-            string[] interfaces = remote.GetInterfaces();

-            foreach (Location loc in locs)

-            {

-                m_neighbourInterfaces[loc] = interfaces;

-                m_neighbourRemote[loc] = remote;

-            }

-        }

-

-        public void RegisterMethod<T>(T e)

-        {

-            m_interfaces[typeof (T)] = e;

-        }

-

-        public bool HasInterface<T>(Location loc)

-        {

-            foreach (string val in m_neighbourInterfaces[loc])

-            {

-                if (val == typeof (T).FullName)

-                {

-                    return true;

-                }

-            }

-            return false;

-        }

-

-        public T RequestInterface<T>(Location loc)

-        {

-            if (m_neighbourRemote.ContainsKey(loc))

-            {

-                return m_neighbourRemote[loc].RequestInterface<T>();

-            }

-            else

-            {

-                throw new IndexOutOfRangeException("No neighbour availible at that location");

-            }

-        }

-

-        public T[] RequestInterface<T>()

-        {

-            List<T> m_t = new List<T>();

-            foreach (RemotingObject remote in m_neighbourRemote.Values)

-            {

-                try

-                {

-                    m_t.Add(remote.RequestInterface<T>());

-                }

-                catch (NotSupportedException)

-                {

-                }

-            }

-            return m_t.ToArray();

-        }

-

-        public Location GetLocationByDirection(Scene scene, Direction dir)

-        {

-            return new Location(0, 0);

-        }

-    }

-}
\ No newline at end of file