aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs19
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 37353c1..063ac73 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -873,7 +873,8 @@ namespace OpenSim.Region.Framework.Scenes
873 m_sendCoarseLocationsMethod = SendCoarseLocationsDefault; 873 m_sendCoarseLocationsMethod = SendCoarseLocationsDefault;
874 Animator = new ScenePresenceAnimator(this); 874 Animator = new ScenePresenceAnimator(this);
875 PresenceType = type; 875 PresenceType = type;
876 DrawDistance = world.DefaultDrawDistance; 876 // DrawDistance = world.DefaultDrawDistance;
877 DrawDistance = Constants.RegionSize;
877 RegionHandle = world.RegionInfo.RegionHandle; 878 RegionHandle = world.RegionInfo.RegionHandle;
878 ControllingClient = client; 879 ControllingClient = client;
879 Firstname = ControllingClient.FirstName; 880 Firstname = ControllingClient.FirstName;
@@ -1918,8 +1919,8 @@ namespace OpenSim.Region.Framework.Scenes
1918 // When we get to the point of re-computing neighbors everytime this 1919 // When we get to the point of re-computing neighbors everytime this
1919 // changes, then start using the agent's drawdistance rather than the 1920 // changes, then start using the agent's drawdistance rather than the
1920 // region's draw distance. 1921 // region's draw distance.
1921 // DrawDistance = agentData.Far; 1922 DrawDistance = agentData.Far;
1922 DrawDistance = Scene.DefaultDrawDistance; 1923 // DrawDistance = Scene.DefaultDrawDistance;
1923 1924
1924 m_mouseLook = (flags & AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0; 1925 m_mouseLook = (flags & AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0;
1925 m_leftButtonDown = (flags & AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0; 1926 m_leftButtonDown = (flags & AgentManager.ControlFlags.AGENT_CONTROL_LBUTTON_DOWN) != 0;
@@ -2277,8 +2278,8 @@ namespace OpenSim.Region.Framework.Scenes
2277 // When we get to the point of re-computing neighbors everytime this 2278 // When we get to the point of re-computing neighbors everytime this
2278 // changes, then start using the agent's drawdistance rather than the 2279 // changes, then start using the agent's drawdistance rather than the
2279 // region's draw distance. 2280 // region's draw distance.
2280 // DrawDistance = agentData.Far; 2281 DrawDistance = agentData.Far;
2281 DrawDistance = Scene.DefaultDrawDistance; 2282 // DrawDistance = Scene.DefaultDrawDistance;
2282 2283
2283 // Check if Client has camera in 'follow cam' or 'build' mode. 2284 // Check if Client has camera in 'follow cam' or 'build' mode.
2284 Vector3 camdif = (Vector3.One * Rotation - Vector3.One * CameraRotation); 2285 Vector3 camdif = (Vector3.One * Rotation - Vector3.One * CameraRotation);
@@ -3824,8 +3825,8 @@ namespace OpenSim.Region.Framework.Scenes
3824 // When we get to the point of re-computing neighbors everytime this 3825 // When we get to the point of re-computing neighbors everytime this
3825 // changes, then start using the agent's drawdistance rather than the 3826 // changes, then start using the agent's drawdistance rather than the
3826 // region's draw distance. 3827 // region's draw distance.
3827 // DrawDistance = cAgentData.Far; 3828 DrawDistance = cAgentData.Far;
3828 DrawDistance = Scene.DefaultDrawDistance; 3829 // DrawDistance = Scene.DefaultDrawDistance;
3829 3830
3830 if (cAgentData.Position != marker) // UGH!! 3831 if (cAgentData.Position != marker) // UGH!!
3831 m_pos = cAgentData.Position + offset; 3832 m_pos = cAgentData.Position + offset;
@@ -3935,8 +3936,8 @@ namespace OpenSim.Region.Framework.Scenes
3935 // When we get to the point of re-computing neighbors everytime this 3936 // When we get to the point of re-computing neighbors everytime this
3936 // changes, then start using the agent's drawdistance rather than the 3937 // changes, then start using the agent's drawdistance rather than the
3937 // region's draw distance. 3938 // region's draw distance.
3938 // DrawDistance = cAgent.Far; 3939 DrawDistance = cAgent.Far;
3939 DrawDistance = Scene.DefaultDrawDistance; 3940 // DrawDistance = Scene.DefaultDrawDistance;
3940 3941
3941 if ((cAgent.Throttles != null) && cAgent.Throttles.Length > 0) 3942 if ((cAgent.Throttles != null) && cAgent.Throttles.Length > 0)
3942 ControllingClient.SetChildAgentThrottle(cAgent.Throttles); 3943 ControllingClient.SetChildAgentThrottle(cAgent.Throttles);