aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorlbsa712007-09-25 06:33:18 +0000
committerlbsa712007-09-25 06:33:18 +0000
commiteb8640f368ab43b27395690404e845f09366c652 (patch)
tree736cca5f1e34fddfe1291046797547e4367afdb6 /OpenSim/Region/Environment
parent* Fixed Culture-variant parsing of config options (diff)
downloadopensim-SC_OLD-eb8640f368ab43b27395690404e845f09366c652.zip
opensim-SC_OLD-eb8640f368ab43b27395690404e845f09366c652.tar.gz
opensim-SC_OLD-eb8640f368ab43b27395690404e845f09366c652.tar.bz2
opensim-SC_OLD-eb8640f368ab43b27395690404e845f09366c652.tar.xz
* Now the OGS1GridServices has a LocalBackEndServices that it forwards intra-instance requests to
* Every Scene has a ClientManager (as every dog it's day) since two scenes can have the same circuit as client.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneBase.cs7
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5fbe918..7381930 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -54,7 +54,6 @@ namespace OpenSim.Region.Environment.Scenes
54{ 54{
55 public partial class Scene : SceneBase 55 public partial class Scene : SceneBase
56 { 56 {
57
58 public delegate bool FilterAvatarList(ScenePresence avatar); 57 public delegate bool FilterAvatarList(ScenePresence avatar);
59 58
60 protected Timer m_heartbeatTimer = new Timer(); 59 protected Timer m_heartbeatTimer = new Timer();
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index b3cd99c..96321c7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -33,11 +33,18 @@ using OpenSim.Framework.Console;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
35using OpenSim.Region.Terrain; 35using OpenSim.Region.Terrain;
36using OpenSim.Framework;
36 37
37namespace OpenSim.Region.Environment.Scenes 38namespace OpenSim.Region.Environment.Scenes
38{ 39{
39 public abstract class SceneBase : IScene 40 public abstract class SceneBase : IScene
40 { 41 {
42 private readonly ClientManager m_clientManager = new ClientManager();
43 public ClientManager ClientManager
44 {
45 get { return m_clientManager; }
46 }
47
41 public Dictionary<LLUUID, EntityBase> Entities; 48 public Dictionary<LLUUID, EntityBase> Entities;
42 protected ulong m_regionHandle; 49 protected ulong m_regionHandle;
43 protected string m_regionName; 50 protected string m_regionName;