diff options
author | Jeff Ames | 2008-08-07 12:55:46 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-07 12:55:46 +0000 |
commit | 0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc (patch) | |
tree | ba6b41e2e10e717ed8743a035c10849db2f0cb14 /OpenSim/Region/ScriptEngine/Shared | |
parent | Update svn properties. (diff) | |
download | opensim-SC_OLD-0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc.zip opensim-SC_OLD-0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc.tar.gz opensim-SC_OLD-0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc.tar.bz2 opensim-SC_OLD-0718aa0b7fd7cb3bb42d36b37f79d8d6cfc725bc.tar.xz |
Minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 401a5ea..2a1efd4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -6702,7 +6702,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6702 | 6702 | ||
6703 | // the object we are in | 6703 | // the object we are in |
6704 | LLUUID objectID = m_host.ParentUUID; | 6704 | LLUUID objectID = m_host.ParentUUID; |
6705 | if(objectID == LLUUID.Zero) return; | 6705 | if (objectID == LLUUID.Zero) return; |
6706 | 6706 | ||
6707 | // we need the permission first, to know which avatar we want to set the camera for | 6707 | // we need the permission first, to know which avatar we want to set the camera for |
6708 | LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; | 6708 | LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; |
@@ -6712,16 +6712,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6712 | ScenePresence presence = World.GetScenePresence(agentID); | 6712 | ScenePresence presence = World.GetScenePresence(agentID); |
6713 | 6713 | ||
6714 | // we are not interested in child-agents | 6714 | // we are not interested in child-agents |
6715 | if(presence.IsChildAgent) return; | 6715 | if (presence.IsChildAgent) return; |
6716 | 6716 | ||
6717 | SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); | 6717 | SortedDictionary<int, float> parameters = new SortedDictionary<int, float>(); |
6718 | object[] data = rules.Data; | 6718 | object[] data = rules.Data; |
6719 | for(int i = 0; i < data.Length; ++i) { | 6719 | for (int i = 0; i < data.Length; ++i) { |
6720 | int type = Convert.ToInt32(data[i++]); | 6720 | int type = Convert.ToInt32(data[i++]); |
6721 | if(i >= data.Length) break; // odd number of entries => ignore the last | 6721 | if (i >= data.Length) break; // odd number of entries => ignore the last |
6722 | 6722 | ||
6723 | // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) | 6723 | // some special cases: Vector parameters are split into 3 float parameters (with type+1, type+2, type+3) |
6724 | switch(type) { | 6724 | switch (type) { |
6725 | case ScriptBaseClass.CAMERA_FOCUS: | 6725 | case ScriptBaseClass.CAMERA_FOCUS: |
6726 | case ScriptBaseClass.CAMERA_FOCUS_OFFSET: | 6726 | case ScriptBaseClass.CAMERA_FOCUS_OFFSET: |
6727 | case ScriptBaseClass.CAMERA_POSITION: | 6727 | case ScriptBaseClass.CAMERA_POSITION: |
@@ -6732,15 +6732,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6732 | break; | 6732 | break; |
6733 | default: | 6733 | default: |
6734 | // TODO: clean that up as soon as the implicit casts are in | 6734 | // TODO: clean that up as soon as the implicit casts are in |
6735 | if(data[i] is LSL_Types.LSLFloat) | 6735 | if (data[i] is LSL_Types.LSLFloat) |
6736 | parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value); | 6736 | parameters.Add(type, (float)((LSL_Types.LSLFloat)data[i]).value); |
6737 | else if(data[i] is LSL_Types.LSLInteger) | 6737 | else if (data[i] is LSL_Types.LSLInteger) |
6738 | parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value); | 6738 | parameters.Add(type, (float)((LSL_Types.LSLInteger)data[i]).value); |
6739 | else parameters.Add(type, Convert.ToSingle(data[i])); | 6739 | else parameters.Add(type, Convert.ToSingle(data[i])); |
6740 | break; | 6740 | break; |
6741 | } | 6741 | } |
6742 | } | 6742 | } |
6743 | if(parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); | 6743 | if (parameters.Count > 0) presence.ControllingClient.SendSetFollowCamProperties(objectID, parameters); |
6744 | } | 6744 | } |
6745 | 6745 | ||
6746 | public void llClearCameraParams() | 6746 | public void llClearCameraParams() |
@@ -6753,7 +6753,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6753 | 6753 | ||
6754 | // the object we are in | 6754 | // the object we are in |
6755 | LLUUID objectID = m_host.ParentUUID; | 6755 | LLUUID objectID = m_host.ParentUUID; |
6756 | if(objectID == LLUUID.Zero) return; | 6756 | if (objectID == LLUUID.Zero) return; |
6757 | 6757 | ||
6758 | // we need the permission first, to know which avatar we want to clear the camera for | 6758 | // we need the permission first, to know which avatar we want to clear the camera for |
6759 | LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; | 6759 | LLUUID agentID = m_host.TaskInventory[invItemID].PermsGranter; |
@@ -6763,7 +6763,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6763 | ScenePresence presence = World.GetScenePresence(agentID); | 6763 | ScenePresence presence = World.GetScenePresence(agentID); |
6764 | 6764 | ||
6765 | // we are not interested in child-agents | 6765 | // we are not interested in child-agents |
6766 | if(presence.IsChildAgent) return; | 6766 | if (presence.IsChildAgent) return; |
6767 | 6767 | ||
6768 | presence.ControllingClient.SendClearFollowCamProperties(objectID); | 6768 | presence.ControllingClient.SendClearFollowCamProperties(objectID); |
6769 | } | 6769 | } |