aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorlbsa712007-07-14 14:13:05 +0000
committerlbsa712007-07-14 14:13:05 +0000
commit1a92dc907316b16e9664cc718a06a4203d9244df (patch)
tree34828f67d1afbf536956003e103ea604810bf289 /OpenSim/Region/Environment/Scenes/Scene.cs
parentAdded AddPreCompiledScript method to ScriptManager. (diff)
downloadopensim-SC_OLD-1a92dc907316b16e9664cc718a06a4203d9244df.zip
opensim-SC_OLD-1a92dc907316b16e9664cc718a06a4203d9244df.tar.gz
opensim-SC_OLD-1a92dc907316b16e9664cc718a06a4203d9244df.tar.bz2
opensim-SC_OLD-1a92dc907316b16e9664cc718a06a4203d9244df.tar.xz
* Apparently, we need to tell ParcelManager that there is no parcels.
* Cleaning lady cleaning build ignores (No, MW, I don't mind, anything for you)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs22
1 files changed, 14 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 737e8fe..6a4b735 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -68,7 +68,6 @@ namespace OpenSim.Region.Environment.Scenes
68 protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>(); 68 protected Dictionary<LLUUID, Caps> capsHandlers = new Dictionary<LLUUID, Caps>();
69 protected BaseHttpServer httpListener; 69 protected BaseHttpServer httpListener;
70 70
71 public ParcelManager parcelManager;
72 public EstateManager estateManager; 71 public EstateManager estateManager;
73 public EventManager eventManager; 72 public EventManager eventManager;
74 public ScriptManager scriptManager; 73 public ScriptManager scriptManager;
@@ -89,6 +88,13 @@ namespace OpenSim.Region.Environment.Scenes
89 } 88 }
90 } 89 }
91 90
91 private ParcelManager m_parcelManager;
92
93 public ParcelManager ParcelManager
94 {
95 get { return m_parcelManager; }
96 }
97
92 #endregion 98 #endregion
93 99
94 #region Constructors 100 #region Constructors
@@ -111,7 +117,7 @@ namespace OpenSim.Region.Environment.Scenes
111 this.m_datastore = m_regInfo.DataStore; 117 this.m_datastore = m_regInfo.DataStore;
112 this.RegisterRegionWithComms(); 118 this.RegisterRegionWithComms();
113 119
114 parcelManager = new ParcelManager(this, this.m_regInfo); 120 m_parcelManager = new ParcelManager(this, this.m_regInfo);
115 estateManager = new EstateManager(this, this.m_regInfo); 121 estateManager = new EstateManager(this, this.m_regInfo);
116 scriptManager = new ScriptManager(this); 122 scriptManager = new ScriptManager(this);
117 eventManager = new EventManager(); 123 eventManager = new EventManager();
@@ -449,7 +455,7 @@ namespace OpenSim.Region.Environment.Scenes
449 SubscribeToClientEvents(client); 455 SubscribeToClientEvents(client);
450 this.estateManager.sendRegionHandshake(client); 456 this.estateManager.sendRegionHandshake(client);
451 CreateAndAddScenePresence(client); 457 CreateAndAddScenePresence(client);
452 this.parcelManager.sendParcelOverlay(client); 458 this.m_parcelManager.sendParcelOverlay(client);
453 459
454 } 460 }
455 461
@@ -479,10 +485,10 @@ namespace OpenSim.Region.Environment.Scenes
479 client.OnLinkObjects += this.LinkObjects; 485 client.OnLinkObjects += this.LinkObjects;
480 client.OnObjectDuplicate += this.DuplicateObject; 486 client.OnObjectDuplicate += this.DuplicateObject;
481 487
482 client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); 488 client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(m_parcelManager.handleParcelPropertiesRequest);
483 client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); 489 client.OnParcelDivideRequest += new ParcelDivideRequest(m_parcelManager.handleParcelDivideRequest);
484 client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); 490 client.OnParcelJoinRequest += new ParcelJoinRequest(m_parcelManager.handleParcelJoinRequest);
485 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); 491 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(m_parcelManager.handleParcelPropertiesUpdateRequest);
486 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 492 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
487 493
488 } 494 }
@@ -524,7 +530,7 @@ namespace OpenSim.Region.Environment.Scenes
524 this.Avatars.Add(client.AgentId, newAvatar); 530 this.Avatars.Add(client.AgentId, newAvatar);
525 } 531 }
526 } 532 }
527 newAvatar.OnSignificantClientMovement += parcelManager.handleSignificantClientMovement; 533 newAvatar.OnSignificantClientMovement += m_parcelManager.handleSignificantClientMovement;
528 return newAvatar; 534 return newAvatar;
529 } 535 }
530 536