diff options
author | Charles Krinke | 2008-11-08 23:55:40 +0000 |
---|---|---|
committer | Charles Krinke | 2008-11-08 23:55:40 +0000 |
commit | 83d83ebbc4289db6b7dc33240415a8d7b2d131cb (patch) | |
tree | bc1040511c169700e6e12e1741f28b8a32f0dfd7 /OpenSim/Region | |
parent | * Quick test for Dahlia, returns Packet Processing Loop to Infinite Loop. (diff) | |
download | opensim-SC_OLD-83d83ebbc4289db6b7dc33240415a8d7b2d131cb.zip opensim-SC_OLD-83d83ebbc4289db6b7dc33240415a8d7b2d131cb.tar.gz opensim-SC_OLD-83d83ebbc4289db6b7dc33240415a8d7b2d131cb.tar.bz2 opensim-SC_OLD-83d83ebbc4289db6b7dc33240415a8d7b2d131cb.tar.xz |
Refactor the detectparams variable from 'd' to
a more meaningful name of 'detectedParams'.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e905da6..97603ee 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -792,55 +792,55 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
792 | public LSL_String llDetectedName(int number) | 792 | public LSL_String llDetectedName(int number) |
793 | { | 793 | { |
794 | m_host.AddScriptLPS(1); | 794 | m_host.AddScriptLPS(1); |
795 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); | 795 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); |
796 | if (d == null) | 796 | if (detectedParams == null) |
797 | return String.Empty; | 797 | return String.Empty; |
798 | return d.Name; | 798 | return detectedParams.Name; |
799 | } | 799 | } |
800 | 800 | ||
801 | public LSL_String llDetectedKey(int number) | 801 | public LSL_String llDetectedKey(int number) |
802 | { | 802 | { |
803 | m_host.AddScriptLPS(1); | 803 | m_host.AddScriptLPS(1); |
804 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); | 804 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); |
805 | if (d == null) | 805 | if (detectedParams == null) |
806 | return String.Empty; | 806 | return String.Empty; |
807 | return d.Key.ToString(); | 807 | return detectedParams.Key.ToString(); |
808 | } | 808 | } |
809 | 809 | ||
810 | public LSL_String llDetectedOwner(int number) | 810 | public LSL_String llDetectedOwner(int number) |
811 | { | 811 | { |
812 | m_host.AddScriptLPS(1); | 812 | m_host.AddScriptLPS(1); |
813 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); | 813 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); |
814 | if (d == null) | 814 | if (detectedParams == null) |
815 | return String.Empty; | 815 | return String.Empty; |
816 | return d.Owner.ToString(); | 816 | return detectedParams.Owner.ToString(); |
817 | } | 817 | } |
818 | 818 | ||
819 | public LSL_Integer llDetectedType(int number) | 819 | public LSL_Integer llDetectedType(int number) |
820 | { | 820 | { |
821 | m_host.AddScriptLPS(1); | 821 | m_host.AddScriptLPS(1); |
822 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); | 822 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); |
823 | if (d == null) | 823 | if (detectedParams == null) |
824 | return 0; | 824 | return 0; |
825 | return new LSL_Integer(d.Type); | 825 | return new LSL_Integer(detectedParams.Type); |
826 | } | 826 | } |
827 | 827 | ||
828 | public LSL_Vector llDetectedPos(int number) | 828 | public LSL_Vector llDetectedPos(int number) |
829 | { | 829 | { |
830 | m_host.AddScriptLPS(1); | 830 | m_host.AddScriptLPS(1); |
831 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); | 831 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); |
832 | if (d == null) | 832 | if (detectedParams == null) |
833 | return new LSL_Vector(); | 833 | return new LSL_Vector(); |
834 | return d.Position; | 834 | return detectedParams.Position; |
835 | } | 835 | } |
836 | 836 | ||
837 | public LSL_Vector llDetectedVel(int number) | 837 | public LSL_Vector llDetectedVel(int number) |
838 | { | 838 | { |
839 | m_host.AddScriptLPS(1); | 839 | m_host.AddScriptLPS(1); |
840 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); | 840 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); |
841 | if (d == null) | 841 | if (detectedParams == null) |
842 | return new LSL_Vector(); | 842 | return new LSL_Vector(); |
843 | return d.Velocity; | 843 | return detectedParams.Velocity; |
844 | } | 844 | } |
845 | 845 | ||
846 | public LSL_Vector llDetectedGrab(int number) | 846 | public LSL_Vector llDetectedGrab(int number) |
@@ -856,19 +856,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
856 | public LSL_Rotation llDetectedRot(int number) | 856 | public LSL_Rotation llDetectedRot(int number) |
857 | { | 857 | { |
858 | m_host.AddScriptLPS(1); | 858 | m_host.AddScriptLPS(1); |
859 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); | 859 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); |
860 | if (d == null) | 860 | if (detectedParams == null) |
861 | return new LSL_Rotation(); | 861 | return new LSL_Rotation(); |
862 | return d.Rotation; | 862 | return detectedParams.Rotation; |
863 | } | 863 | } |
864 | 864 | ||
865 | public LSL_Integer llDetectedGroup(int number) | 865 | public LSL_Integer llDetectedGroup(int number) |
866 | { | 866 | { |
867 | m_host.AddScriptLPS(1); | 867 | m_host.AddScriptLPS(1); |
868 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, number); | 868 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, number); |
869 | if (d == null) | 869 | if (detectedParams == null) |
870 | return new LSL_Integer(0); | 870 | return new LSL_Integer(0); |
871 | if (m_host.GroupID == d.Group) | 871 | if (m_host.GroupID == detectedParams.Group) |
872 | return new LSL_Integer(1); | 872 | return new LSL_Integer(1); |
873 | return new LSL_Integer(0); | 873 | return new LSL_Integer(0); |
874 | } | 874 | } |
@@ -8057,10 +8057,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8057 | public void llMapDestination(string simname, LSL_Vector pos, LSL_Vector lookAt) | 8057 | public void llMapDestination(string simname, LSL_Vector pos, LSL_Vector lookAt) |
8058 | { | 8058 | { |
8059 | m_host.AddScriptLPS(1); | 8059 | m_host.AddScriptLPS(1); |
8060 | DetectParams d = m_ScriptEngine.GetDetectParams(m_itemID, 0); | 8060 | DetectParams detectedParams = m_ScriptEngine.GetDetectParams(m_itemID, 0); |
8061 | if (d == null) return; // only works on the first detected avatar | 8061 | if (detectedParams == null) return; // only works on the first detected avatar |
8062 | 8062 | ||
8063 | ScenePresence avatar = World.GetScenePresence(d.Key); | 8063 | ScenePresence avatar = World.GetScenePresence(detectedParams.Key); |
8064 | if (avatar != null) | 8064 | if (avatar != null) |
8065 | { | 8065 | { |
8066 | avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, simname, | 8066 | avatar.ControllingClient.SendScriptTeleportRequest(m_host.Name, simname, |
@@ -8428,10 +8428,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8428 | LSL_List ret = new LSL_List(); | 8428 | LSL_List ret = new LSL_List(); |
8429 | if (land != null) | 8429 | if (land != null) |
8430 | { | 8430 | { |
8431 | foreach (KeyValuePair<UUID, int> d in land.getLandObjectOwners()) | 8431 | foreach (KeyValuePair<UUID, int> detectedParams in land.getLandObjectOwners()) |
8432 | { | 8432 | { |
8433 | ret.Add(d.Key.ToString()); | 8433 | ret.Add(detectedParams.Key.ToString()); |
8434 | ret.Add(d.Value); | 8434 | ret.Add(detectedParams.Value); |
8435 | } | 8435 | } |
8436 | } | 8436 | } |
8437 | // ScriptSleep(2000); | 8437 | // ScriptSleep(2000); |