aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2009-01-20 06:07:36 +0000
committerTeravus Ovares2009-01-20 06:07:36 +0000
commite1f5e2df3f921cc019d11a5bece85e9de4f0fa88 (patch)
tree3c86dcaa05060ba631872fee0282987ffb9cfaec /OpenSim/Region/Environment/Scenes
parentVery minor: added a missing {0} in a couple of Error messages. (diff)
downloadopensim-SC_OLD-e1f5e2df3f921cc019d11a5bece85e9de4f0fa88.zip
opensim-SC_OLD-e1f5e2df3f921cc019d11a5bece85e9de4f0fa88.tar.gz
opensim-SC_OLD-e1f5e2df3f921cc019d11a5bece85e9de4f0fa88.tar.bz2
opensim-SC_OLD-e1f5e2df3f921cc019d11a5bece85e9de4f0fa88.tar.xz
* minor: A few comments. A bit of cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs13
1 files changed, 9 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 77d5b93..2099e9a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -2313,7 +2313,8 @@ namespace OpenSim.Region.Environment.Scenes
2313 sLLVector3 tempCameraCenter = new sLLVector3(new Vector3(m_CameraCenter.X, m_CameraCenter.Y, m_CameraCenter.Z)); 2313 sLLVector3 tempCameraCenter = new sLLVector3(new Vector3(m_CameraCenter.X, m_CameraCenter.Y, m_CameraCenter.Z));
2314 cadu.cameraPosition = tempCameraCenter; 2314 cadu.cameraPosition = tempCameraCenter;
2315 cadu.drawdistance = m_DrawDistance; 2315 cadu.drawdistance = m_DrawDistance;
2316 cadu.godlevel = m_godlevel; 2316 if (m_scene.Permissions.IsGod(new UUID(cadu.AgentID)))
2317 cadu.godlevel = m_godlevel;
2317 cadu.GroupAccess = 0; 2318 cadu.GroupAccess = 0;
2318 cadu.Position = new sLLVector3(AbsolutePosition); 2319 cadu.Position = new sLLVector3(AbsolutePosition);
2319 cadu.regionHandle = m_scene.RegionInfo.RegionHandle; 2320 cadu.regionHandle = m_scene.RegionInfo.RegionHandle;
@@ -2663,7 +2664,11 @@ namespace OpenSim.Region.Environment.Scenes
2663 cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY; 2664 cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
2664 } 2665 }
2665 2666
2666 cAgent.GodLevel = (byte)m_godlevel; 2667 if (m_scene.Permissions.IsGod(new UUID(cAgent.AgentID)))
2668 cAgent.GodLevel = (byte)m_godlevel;
2669 else
2670 cAgent.GodLevel = (byte) 0;
2671
2667 cAgent.AlwaysRun = m_setAlwaysRun; 2672 cAgent.AlwaysRun = m_setAlwaysRun;
2668 2673
2669 //cAgent.AgentTextures = ??? 2674 //cAgent.AgentTextures = ???
@@ -2700,8 +2705,8 @@ namespace OpenSim.Region.Environment.Scenes
2700 { 2705 {
2701 m_physicsActor.Flying = ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0); 2706 m_physicsActor.Flying = ((m_AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY) != 0);
2702 } 2707 }
2703 2708 if (m_scene.Permissions.IsGod(new UUID(cAgent.AgentID)))
2704 m_godlevel = cAgent.GodLevel; 2709 m_godlevel = cAgent.GodLevel;
2705 m_setAlwaysRun = cAgent.AlwaysRun; 2710 m_setAlwaysRun = cAgent.AlwaysRun;
2706 2711
2707 //cAgent.AgentTextures = ??? 2712 //cAgent.AgentTextures = ???