diff options
author | Jeff Ames | 2009-10-01 01:00:09 +0900 |
---|---|---|
committer | Jeff Ames | 2009-10-01 01:17:47 +0900 |
commit | ee205e7e812e170f670e690a4e0fa9caa652f226 (patch) | |
tree | df407e66d9aa47a884e39d5d86b877d6ef468a1a /OpenSim/Region/Framework/Scenes/ScenePresence.cs | |
parent | adding LandDataSerializer (not connected anywhere, work-in-progress) (diff) | |
download | opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.zip opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.gz opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.bz2 opensim-SC-ee205e7e812e170f670e690a4e0fa9caa652f226.tar.xz |
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 286b7ca..0e1b8d9 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -776,7 +776,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
776 | // Moved this from SendInitialData to ensure that m_appearance is initialized | 776 | // Moved this from SendInitialData to ensure that m_appearance is initialized |
777 | // before the inventory is processed in MakeRootAgent. This fixes a race condition | 777 | // before the inventory is processed in MakeRootAgent. This fixes a race condition |
778 | // related to the handling of attachments | 778 | // related to the handling of attachments |
779 | //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); | 779 | //m_scene.GetAvatarAppearance(m_controllingClient, out m_appearance); |
780 | if (m_scene.TestBorderCross(pos, Cardinals.E)) | 780 | if (m_scene.TestBorderCross(pos, Cardinals.E)) |
781 | { | 781 | { |
782 | Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); | 782 | Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.E); |
@@ -1235,7 +1235,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1235 | if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) | 1235 | if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) |
1236 | { | 1236 | { |
1237 | StandUp(); | 1237 | StandUp(); |
1238 | } | 1238 | } |
1239 | 1239 | ||
1240 | // Check if Client has camera in 'follow cam' or 'build' mode. | 1240 | // Check if Client has camera in 'follow cam' or 'build' mode. |
1241 | Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); | 1241 | Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); |
@@ -1489,7 +1489,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1489 | { | 1489 | { |
1490 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); | 1490 | // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); |
1491 | // m_log.DebugFormat( | 1491 | // m_log.DebugFormat( |
1492 | // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); | 1492 | // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); |
1493 | 1493 | ||
1494 | AddNewMovement(agent_control_v3, q); | 1494 | AddNewMovement(agent_control_v3, q); |
1495 | 1495 | ||
@@ -2306,7 +2306,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2306 | /// Rotate the avatar to the given rotation and apply a movement in the given relative vector | 2306 | /// Rotate the avatar to the given rotation and apply a movement in the given relative vector |
2307 | /// </summary> | 2307 | /// </summary> |
2308 | /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> | 2308 | /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> |
2309 | /// <param name="rotation">The direction in which this avatar should now face. | 2309 | /// <param name="rotation">The direction in which this avatar should now face. |
2310 | public void AddNewMovement(Vector3 vec, Quaternion rotation) | 2310 | public void AddNewMovement(Vector3 vec, Quaternion rotation) |
2311 | { | 2311 | { |
2312 | if (m_isChildAgent) | 2312 | if (m_isChildAgent) |
@@ -2649,7 +2649,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2649 | /// Tell the client for this scene presence what items it should be wearing now | 2649 | /// Tell the client for this scene presence what items it should be wearing now |
2650 | /// </summary> | 2650 | /// </summary> |
2651 | public void SendWearables() | 2651 | public void SendWearables() |
2652 | { | 2652 | { |
2653 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); | 2653 | ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++); |
2654 | } | 2654 | } |
2655 | 2655 | ||
@@ -3175,7 +3175,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3175 | else | 3175 | else |
3176 | { | 3176 | { |
3177 | wears[i++] = UUID.Zero; | 3177 | wears[i++] = UUID.Zero; |
3178 | wears[i++] = UUID.Zero; | 3178 | wears[i++] = UUID.Zero; |
3179 | } | 3179 | } |
3180 | } | 3180 | } |
3181 | cAgent.Wearables = wears; | 3181 | cAgent.Wearables = wears; |
@@ -3487,7 +3487,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3487 | 3487 | ||
3488 | public bool HasAttachments() | 3488 | public bool HasAttachments() |
3489 | { | 3489 | { |
3490 | return m_attachments.Count > 0; | 3490 | return m_attachments.Count > 0; |
3491 | } | 3491 | } |
3492 | 3492 | ||
3493 | public bool HasScriptedAttachments() | 3493 | public bool HasScriptedAttachments() |