diff options
author | mingchen | 2007-06-08 19:30:27 +0000 |
---|---|---|
committer | mingchen | 2007-06-08 19:30:27 +0000 |
commit | 8157182d378de82ae7443b57a90e07267ce1466e (patch) | |
tree | 3139163f719fdbb24331a2fc4f7afd98c36e4764 /OpenSim/OpenSim.World/World.cs | |
parent | *Merged EstateManager, EstateSettings, ParcelManager,Parcel, and ParcelData c... (diff) | |
download | opensim-SC-8157182d378de82ae7443b57a90e07267ce1466e.zip opensim-SC-8157182d378de82ae7443b57a90e07267ce1466e.tar.gz opensim-SC-8157182d378de82ae7443b57a90e07267ce1466e.tar.bz2 opensim-SC-8157182d378de82ae7443b57a90e07267ce1466e.tar.xz |
*RegionInfo in Avatar class now protected again (oops, my fault)
Diffstat (limited to 'OpenSim/OpenSim.World/World.cs')
-rw-r--r-- | OpenSim/OpenSim.World/World.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/OpenSim.World/World.cs b/OpenSim/OpenSim.World/World.cs index 1f97820..e51c983 100644 --- a/OpenSim/OpenSim.World/World.cs +++ b/OpenSim/OpenSim.World/World.cs | |||
@@ -83,6 +83,9 @@ namespace OpenSim.world | |||
83 | this.m_datastore = m_regInfo.DataStore; | 83 | this.m_datastore = m_regInfo.DataStore; |
84 | this.RegisterRegionWithComms(); | 84 | this.RegisterRegionWithComms(); |
85 | 85 | ||
86 | parcelManager = new ParcelManager(this,this.m_regInfo); | ||
87 | estateManager = new EstateManager(this,this.m_regInfo); | ||
88 | |||
86 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); | 89 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); |
87 | m_scripts = new Dictionary<string, ScriptFactory>(); | 90 | m_scripts = new Dictionary<string, ScriptFactory>(); |
88 | 91 | ||
@@ -463,7 +466,7 @@ namespace OpenSim.world | |||
463 | try | 466 | try |
464 | { | 467 | { |
465 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); | 468 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); |
466 | newAvatar = new Avatar(remoteClient, this, m_clientThreads); | 469 | newAvatar = new Avatar(remoteClient, this, m_clientThreads,this.m_regInfo); |
467 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); | 470 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); |
468 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); | 471 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); |
469 | newAvatar.SendRegionHandshake(); | 472 | newAvatar.SendRegionHandshake(); |