aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/OpenSim.RegionServer/world/World.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/OpenSim.RegionServer/world/World.cs')
-rw-r--r--OpenSim/OpenSim.RegionServer/world/World.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
index ad1ce30..d2a13ca 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.cs
@@ -35,6 +35,7 @@ namespace OpenSim.world
35 private Dictionary<string, ScriptFactory> m_scripts; 35 private Dictionary<string, ScriptFactory> m_scripts;
36 private Mutex updateLock; 36 private Mutex updateLock;
37 public string m_datastore; 37 public string m_datastore;
38 public ParcelManager parcelManager;
38 39
39 #region Properties 40 #region Properties
40 public PhysicsScene PhysScene 41 public PhysicsScene PhysScene
@@ -85,6 +86,8 @@ namespace OpenSim.world
85 Avatar.LoadAnims(); 86 Avatar.LoadAnims();
86 this.SetDefaultScripts(); 87 this.SetDefaultScripts();
87 this.LoadScriptEngines(); 88 this.LoadScriptEngines();
89 parcelManager = new ParcelManager(this);
90
88 } 91 }
89 catch (Exception e) 92 catch (Exception e)
90 { 93 {
@@ -564,6 +567,7 @@ namespace OpenSim.world
564 agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects); 567 agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects);
565 agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim); 568 agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim);
566 agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape); 569 agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape);
570
567 agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim); 571 agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim);
568 agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags); 572 agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags);
569 agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture); 573 agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture);
@@ -571,6 +575,8 @@ namespace OpenSim.world
571 agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation); 575 agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation);
572 agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale); 576 agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale);
573 agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); 577 agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject);
578
579 agentClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(ParcelPropertiesRequest);
574 Avatar newAvatar = null; 580 Avatar newAvatar = null;
575 try 581 try
576 { 582 {
@@ -618,6 +624,8 @@ namespace OpenSim.world
618 return newAvatar; 624 return newAvatar;
619 } 625 }
620 626
627
628
621 public override void RemoveViewerAgent(ClientView agentClient) 629 public override void RemoveViewerAgent(ClientView agentClient)
622 { 630 {
623 try 631 try