aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-12 22:51:56 +0100
committerJustin Clark-Casey (justincc)2011-09-12 22:51:56 +0100
commit56cd7d96851203efa3e84b4c8be70177e2d2d453 (patch)
tree6bbd1840a82bd3885950ea138518f9ff99df0ac0 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentminor: if the script engine fails to find a prim for a script, also print out... (diff)
downloadopensim-SC-56cd7d96851203efa3e84b4c8be70177e2d2d453.zip
opensim-SC-56cd7d96851203efa3e84b4c8be70177e2d2d453.tar.gz
opensim-SC-56cd7d96851203efa3e84b4c8be70177e2d2d453.tar.bz2
opensim-SC-56cd7d96851203efa3e84b4c8be70177e2d2d453.tar.xz
stop the redundant passing in of RegionInfo to SceneGraph, since the Scene is always passed in at the same time.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 86e1e11..9b8afe3 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -707,9 +707,9 @@ namespace OpenSim.Region.Framework.Scenes
707 #endregion 707 #endregion
708 708
709 #region Constructor(s) 709 #region Constructor(s)
710 710
711 public ScenePresence( 711 public ScenePresence(
712 IClientAPI client, Scene world, RegionInfo reginfo, AvatarAppearance appearance, PresenceType type) 712 IClientAPI client, Scene world, AvatarAppearance appearance, PresenceType type)
713 { 713 {
714 AttachmentsSyncLock = new Object(); 714 AttachmentsSyncLock = new Object();
715 715
@@ -718,14 +718,14 @@ namespace OpenSim.Region.Framework.Scenes
718 m_animator = new ScenePresenceAnimator(this); 718 m_animator = new ScenePresenceAnimator(this);
719 PresenceType = type; 719 PresenceType = type;
720 m_DrawDistance = world.DefaultDrawDistance; 720 m_DrawDistance = world.DefaultDrawDistance;
721 m_rootRegionHandle = reginfo.RegionHandle; 721 m_rootRegionHandle = world.RegionInfo.RegionHandle;
722 m_controllingClient = client; 722 m_controllingClient = client;
723 m_firstname = m_controllingClient.FirstName; 723 m_firstname = m_controllingClient.FirstName;
724 m_lastname = m_controllingClient.LastName; 724 m_lastname = m_controllingClient.LastName;
725 m_name = String.Format("{0} {1}", m_firstname, m_lastname); 725 m_name = String.Format("{0} {1}", m_firstname, m_lastname);
726 m_scene = world; 726 m_scene = world;
727 m_uuid = client.AgentId; 727 m_uuid = client.AgentId;
728 m_regionInfo = reginfo; 728 m_regionInfo = world.RegionInfo;
729 m_localId = m_scene.AllocateLocalId(); 729 m_localId = m_scene.AllocateLocalId();
730 730
731 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); 731 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid);