diff options
author | John Hurliman | 2010-03-03 12:12:32 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-03 12:12:32 -0800 |
commit | 13a8d11c4678b5a421eb814d4253de235532de37 (patch) | |
tree | 1c3cbf35155ee0a830c7c7fe5246f5c4a6d8e8d9 /OpenSim/Region/Framework | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-13a8d11c4678b5a421eb814d4253de235532de37.zip opensim-SC_OLD-13a8d11c4678b5a421eb814d4253de235532de37.tar.gz opensim-SC_OLD-13a8d11c4678b5a421eb814d4253de235532de37.tar.bz2 opensim-SC_OLD-13a8d11c4678b5a421eb814d4253de235532de37.tar.xz |
Removing the sLLVector3 dinosaur
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 6a9f016..c7008df 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -2675,13 +2675,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
2675 | cadu.AgentID = UUID.Guid; | 2675 | cadu.AgentID = UUID.Guid; |
2676 | cadu.alwaysrun = m_setAlwaysRun; | 2676 | cadu.alwaysrun = m_setAlwaysRun; |
2677 | cadu.AVHeight = m_avHeight; | 2677 | cadu.AVHeight = m_avHeight; |
2678 | sLLVector3 tempCameraCenter = new sLLVector3(new Vector3(m_CameraCenter.X, m_CameraCenter.Y, m_CameraCenter.Z)); | 2678 | Vector3 tempCameraCenter = m_CameraCenter; |
2679 | cadu.cameraPosition = tempCameraCenter; | 2679 | cadu.cameraPosition = tempCameraCenter; |
2680 | cadu.drawdistance = m_DrawDistance; | 2680 | cadu.drawdistance = m_DrawDistance; |
2681 | if (m_scene.Permissions.IsGod(new UUID(cadu.AgentID))) | 2681 | if (m_scene.Permissions.IsGod(new UUID(cadu.AgentID))) |
2682 | cadu.godlevel = m_godlevel; | 2682 | cadu.godlevel = m_godlevel; |
2683 | cadu.GroupAccess = 0; | 2683 | cadu.GroupAccess = 0; |
2684 | cadu.Position = new sLLVector3(AbsolutePosition); | 2684 | cadu.Position = AbsolutePosition; |
2685 | cadu.regionHandle = m_rootRegionHandle; | 2685 | cadu.regionHandle = m_rootRegionHandle; |
2686 | float multiplier = 1; | 2686 | float multiplier = 1; |
2687 | int innacurateNeighbors = m_scene.GetInaccurateNeighborCount(); | 2687 | int innacurateNeighbors = m_scene.GetInaccurateNeighborCount(); |
@@ -2696,7 +2696,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2696 | 2696 | ||
2697 | //m_log.Info("[NeighborThrottle]: " + m_scene.GetInaccurateNeighborCount().ToString() + " - m: " + multiplier.ToString()); | 2697 | //m_log.Info("[NeighborThrottle]: " + m_scene.GetInaccurateNeighborCount().ToString() + " - m: " + multiplier.ToString()); |
2698 | cadu.throttles = ControllingClient.GetThrottlesPacked(multiplier); | 2698 | cadu.throttles = ControllingClient.GetThrottlesPacked(multiplier); |
2699 | cadu.Velocity = new sLLVector3(Velocity); | 2699 | cadu.Velocity = Velocity; |
2700 | 2700 | ||
2701 | AgentPosition agentpos = new AgentPosition(); | 2701 | AgentPosition agentpos = new AgentPosition(); |
2702 | agentpos.CopyFrom(cadu); | 2702 | agentpos.CopyFrom(cadu); |