diff options
First part of Scene refactoring:
Started the move of some of the methods from scene into a inner class (currently called InnerScene.cs), the idea being that the code related to the 3d scene (primitive/entities/Avatars etc) will be in this inner class, then what is now Scene.cs will be left as a kind of wrapper class around it. And once the spilt is complete can be renamed to something like RegionInstance (or any name that sounds good and ids it as the Region layer class that "has" a scene).
Added SceneCommunicationService which at the moment is a kind of high level wrapper around commsManager. The idea being that it has a higher level API for the Region/Scene to send messages to the other regions on the grid. a Example of the API is that instead of having sendXmessage methods, it has more functional level method like PassAvatarToNeighbour. Hopefully this will allow more freedom to do changes in communications that doesn't break other things.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneBase.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs index ba4c40e..1494437 100644 --- a/OpenSim/Region/Environment/Scenes/SceneBase.cs +++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs | |||
@@ -37,6 +37,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
37 | { | 37 | { |
38 | public abstract class SceneBase : IScene | 38 | public abstract class SceneBase : IScene |
39 | { | 39 | { |
40 | #region Fields | ||
40 | private readonly ClientManager m_clientManager = new ClientManager(); | 41 | private readonly ClientManager m_clientManager = new ClientManager(); |
41 | 42 | ||
42 | public ClientManager ClientManager | 43 | public ClientManager ClientManager |
@@ -44,7 +45,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
44 | get { return m_clientManager; } | 45 | get { return m_clientManager; } |
45 | } | 46 | } |
46 | 47 | ||
47 | public Dictionary<LLUUID, EntityBase> Entities; | 48 | // public Dictionary<LLUUID, EntityBase> Entities; |
48 | protected ulong m_regionHandle; | 49 | protected ulong m_regionHandle; |
49 | protected string m_regionName; | 50 | protected string m_regionName; |
50 | protected RegionInfo m_regInfo; | 51 | protected RegionInfo m_regInfo; |
@@ -69,6 +70,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
69 | private uint m_nextLocalId = 8880000; | 70 | private uint m_nextLocalId = 8880000; |
70 | protected AssetCache assetCache; | 71 | protected AssetCache assetCache; |
71 | 72 | ||
73 | #endregion | ||
74 | |||
72 | #region Update Methods | 75 | #region Update Methods |
73 | 76 | ||
74 | /// <summary> | 77 | /// <summary> |