diff options
author | Justin Clark-Casey (justincc) | 2011-09-12 23:00:15 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-12 23:00:15 +0100 |
commit | dea0935361d536da7fada83069e06a7c476b5351 (patch) | |
tree | 454d39a5275ff2c0125ec32cc77e58808124ed7b /OpenSim/Region/Framework | |
parent | remove the unused SP.initializeScenePresence() (diff) | |
download | opensim-SC_OLD-dea0935361d536da7fada83069e06a7c476b5351.zip opensim-SC_OLD-dea0935361d536da7fada83069e06a7c476b5351.tar.gz opensim-SC_OLD-dea0935361d536da7fada83069e06a7c476b5351.tar.bz2 opensim-SC_OLD-dea0935361d536da7fada83069e06a7c476b5351.tar.xz |
eliminate redundant SP.m_regionInfo since it always has the scene.
We were already referencing through the scene in some places.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 1050507..879352d 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -188,7 +188,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
188 | 188 | ||
189 | private float m_health = 100f; | 189 | private float m_health = 100f; |
190 | 190 | ||
191 | protected RegionInfo m_regionInfo; | ||
192 | protected ulong crossingFromRegion; | 191 | protected ulong crossingFromRegion; |
193 | 192 | ||
194 | private readonly Vector3[] Dir_Vectors = new Vector3[9]; | 193 | private readonly Vector3[] Dir_Vectors = new Vector3[9]; |
@@ -725,7 +724,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
725 | m_name = String.Format("{0} {1}", m_firstname, m_lastname); | 724 | m_name = String.Format("{0} {1}", m_firstname, m_lastname); |
726 | m_scene = world; | 725 | m_scene = world; |
727 | m_uuid = client.AgentId; | 726 | m_uuid = client.AgentId; |
728 | m_regionInfo = world.RegionInfo; | ||
729 | m_localId = m_scene.AllocateLocalId(); | 727 | m_localId = m_scene.AllocateLocalId(); |
730 | 728 | ||
731 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); | 729 | UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, m_uuid); |
@@ -1156,7 +1154,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1156 | 1154 | ||
1157 | //m_log.DebugFormat("Completed movement"); | 1155 | //m_log.DebugFormat("Completed movement"); |
1158 | 1156 | ||
1159 | m_controllingClient.MoveAgentIntoRegion(m_regionInfo, AbsolutePosition, look); | 1157 | m_controllingClient.MoveAgentIntoRegion(m_scene.RegionInfo, AbsolutePosition, look); |
1160 | SendInitialData(); | 1158 | SendInitialData(); |
1161 | 1159 | ||
1162 | // Create child agents in neighbouring regions | 1160 | // Create child agents in neighbouring regions |
@@ -2877,8 +2875,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2877 | /// </returns> | 2875 | /// </returns> |
2878 | protected int HaveNeighbor(Cardinals car, ref int[] fix) | 2876 | protected int HaveNeighbor(Cardinals car, ref int[] fix) |
2879 | { | 2877 | { |
2880 | uint neighbourx = m_regionInfo.RegionLocX; | 2878 | uint neighbourx = m_scene.RegionInfo.RegionLocX; |
2881 | uint neighboury = m_regionInfo.RegionLocY; | 2879 | uint neighboury = m_scene.RegionInfo.RegionLocY; |
2882 | 2880 | ||
2883 | int dir = (int)car; | 2881 | int dir = (int)car; |
2884 | 2882 | ||
@@ -2898,8 +2896,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
2898 | 2896 | ||
2899 | if (neighbourRegion == null) | 2897 | if (neighbourRegion == null) |
2900 | { | 2898 | { |
2901 | fix[0] = (int)(m_regionInfo.RegionLocX - neighbourx); | 2899 | fix[0] = (int)(m_scene.RegionInfo.RegionLocX - neighbourx); |
2902 | fix[1] = (int)(m_regionInfo.RegionLocY - neighboury); | 2900 | fix[1] = (int)(m_scene.RegionInfo.RegionLocY - neighboury); |
2903 | return dir * (-1); | 2901 | return dir * (-1); |
2904 | } | 2902 | } |
2905 | else | 2903 | else |
@@ -3616,7 +3614,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3616 | scriptedcontrols[Script_item_UUID] = obj; | 3614 | scriptedcontrols[Script_item_UUID] = obj; |
3617 | } | 3615 | } |
3618 | } | 3616 | } |
3619 | 3617 | ||
3620 | ControllingClient.SendTakeControls(controls, pass_on == 1 ? true : false, true); | 3618 | ControllingClient.SendTakeControls(controls, pass_on == 1 ? true : false, true); |
3621 | } | 3619 | } |
3622 | 3620 | ||