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

* encapsulated some public fields

afrisby
lbsa71 2007-07-14 14:15:58 +00:00
parent 1a92dc9073
commit 0bb2b7f18d
4 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -68,10 +68,6 @@ namespace OpenSim.Region.Environment.Scenes
protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
protected BaseHttpServer httpListener; protected BaseHttpServer httpListener;
public EstateManager estateManager;
public EventManager eventManager;
public ScriptManager scriptManager;
#region Properties #region Properties
/// <summary> /// <summary>
/// ///
@ -89,12 +85,29 @@ namespace OpenSim.Region.Environment.Scenes
} }
private ParcelManager m_parcelManager; private ParcelManager m_parcelManager;
public ParcelManager ParcelManager public ParcelManager ParcelManager
{ {
get { return m_parcelManager; } get { return m_parcelManager; }
} }
private EstateManager m_estateManager;
public EstateManager EstateManager
{
get { return m_estateManager; }
}
private EventManager m_eventManager;
public EventManager EventManager
{
get { return m_eventManager; }
}
private ScriptManager m_scriptManager;
public ScriptManager ScriptManager
{
get { return m_scriptManager; }
}
#endregion #endregion
#region Constructors #region Constructors
@ -118,9 +131,9 @@ namespace OpenSim.Region.Environment.Scenes
this.RegisterRegionWithComms(); this.RegisterRegionWithComms();
m_parcelManager = new ParcelManager(this, this.m_regInfo); m_parcelManager = new ParcelManager(this, this.m_regInfo);
estateManager = new EstateManager(this, this.m_regInfo); m_estateManager = new EstateManager(this, this.m_regInfo);
scriptManager = new ScriptManager(this); m_scriptManager = new ScriptManager(this);
eventManager = new EventManager(); m_eventManager = new EventManager();
MainLog.Instance.Verbose("World.cs - creating new entitities instance"); MainLog.Instance.Verbose("World.cs - creating new entitities instance");
Entities = new Dictionary<LLUUID, EntityBase>(); Entities = new Dictionary<LLUUID, EntityBase>();
@ -189,7 +202,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
// General purpose event manager // General purpose event manager
eventManager.TriggerOnFrame(); m_eventManager.TriggerOnFrame();
//backup world data //backup world data
this.storageCount++; this.storageCount++;
@ -453,7 +466,7 @@ namespace OpenSim.Region.Environment.Scenes
public override void AddNewClient(IClientAPI client, bool child) public override void AddNewClient(IClientAPI client, bool child)
{ {
SubscribeToClientEvents(client); SubscribeToClientEvents(client);
this.estateManager.sendRegionHandshake(client); this.m_estateManager.sendRegionHandshake(client);
CreateAndAddScenePresence(client); CreateAndAddScenePresence(client);
this.m_parcelManager.sendParcelOverlay(client); this.m_parcelManager.sendParcelOverlay(client);
@ -489,7 +502,7 @@ namespace OpenSim.Region.Environment.Scenes
client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest); client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest);
client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest); client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest);
client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest); client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest);
client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
} }
@ -541,7 +554,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="agentID"></param> /// <param name="agentID"></param>
public override void RemoveClient(LLUUID agentID) public override void RemoveClient(LLUUID agentID)
{ {
eventManager.TriggerOnRemovePresence(agentID); m_eventManager.TriggerOnRemovePresence(agentID);
ScenePresence avatar = this.RequestAvatar(agentID); ScenePresence avatar = this.RequestAvatar(agentID);

2
OpenSim/Region/Environment/Scenes/SceneObject.cs
View File

@ -76,7 +76,7 @@ namespace OpenSim.Region.Environment.Scenes
this.CreateRootFromShape(ownerID, localID, shape, pos); this.CreateRootFromShape(ownerID, localID, shape, pos);
// Setup a backup event listener // Setup a backup event listener
world.eventManager.OnBackup += new EventManager.OnBackupDelegate(ProcessBackup); world.EventManager.OnBackup += new EventManager.OnBackupDelegate(ProcessBackup);
} }
/// <summary> /// <summary>

2
OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
View File

@ -50,7 +50,7 @@ namespace OpenSim.Region.Scripting
public ScriptInfo(Scene scene) public ScriptInfo(Scene scene)
{ {
world = scene; world = scene;
events = world.eventManager; events = world.EventManager;
logger = MainLog.Instance; logger = MainLog.Instance;
api = new ScriptAPI(scene); api = new ScriptAPI(scene);
} }

4
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -97,7 +97,7 @@ namespace SimpleApp
{ {
this.StartTimer(); this.StartTimer();
scriptManager.AddPreCompiledScript(new PulseScript()); ScriptManager.AddPreCompiledScript(new PulseScript());
PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox(); PrimitiveBaseShape shape = PrimitiveBaseShape.DefaultBox();
shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f); shape.Scale = new LLVector3(0.5f, 0.5f, 0.5f);
@ -113,7 +113,7 @@ namespace SimpleApp
{ {
Entities[UUID].update(); Entities[UUID].update();
} }
eventManager.TriggerOnFrame(); EventManager.TriggerOnFrame();
} }
#endregion #endregion