aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authorJeff Ames2008-08-16 17:26:25 +0000
committerJeff Ames2008-08-16 17:26:25 +0000
commit6fa26f5b41ab1a455783342c200fe68aeae515aa (patch)
tree6295bd30044aff271f616b178586acfbb5feeeec /OpenSim/Region/ScriptEngine/Common
parent* Adds Slightly better terrain shading to maptile generation. (diff)
downloadopensim-SC_OLD-6fa26f5b41ab1a455783342c200fe68aeae515aa.zip
opensim-SC_OLD-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.gz
opensim-SC_OLD-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.bz2
opensim-SC_OLD-6fa26f5b41ab1a455783342c200fe68aeae515aa.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs46
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_Types.cs182
2 files changed, 114 insertions, 114 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index d7cd027..25c0d9a 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -5704,12 +5704,12 @@ namespace OpenSim.Region.ScriptEngine.Common
5704 5704
5705 LSL_Types.list l = new LSL_Types.list(); 5705 LSL_Types.list l = new LSL_Types.list();
5706 ScenePresence av = World.GetScenePresence(id); 5706 ScenePresence av = World.GetScenePresence(id);
5707 if( av == null ) 5707 if (av == null)
5708 return l; 5708 return l;
5709 LLUUID[] anims; 5709 LLUUID[] anims;
5710 anims = av.GetAnimationArray(); 5710 anims = av.GetAnimationArray();
5711 foreach( LLUUID foo in anims ) 5711 foreach (LLUUID foo in anims)
5712 l.Add( foo.ToString() ); 5712 l.Add(foo.ToString());
5713 return l; 5713 return l;
5714 } 5714 }
5715 5715
@@ -6813,20 +6813,20 @@ namespace OpenSim.Region.ScriptEngine.Common
6813 public void llParcelMediaCommandList(LSL_Types.list commandList) 6813 public void llParcelMediaCommandList(LSL_Types.list commandList)
6814 { 6814 {
6815 //TO DO: Implement the missing commands 6815 //TO DO: Implement the missing commands
6816 //PARCEL_MEDIA_COMMAND_STOP Stop the media stream and go back to the first frame. 6816 //PARCEL_MEDIA_COMMAND_STOP Stop the media stream and go back to the first frame.
6817 //PARCEL_MEDIA_COMMAND_PAUSE Pause the media stream (stop playing but stay on current frame). 6817 //PARCEL_MEDIA_COMMAND_PAUSE Pause the media stream (stop playing but stay on current frame).
6818 //PARCEL_MEDIA_COMMAND_PLAY Start the media stream playing from the current frame and stop when the end is reached. 6818 //PARCEL_MEDIA_COMMAND_PLAY Start the media stream playing from the current frame and stop when the end is reached.
6819 //PARCEL_MEDIA_COMMAND_LOOP Start the media stream playing from the current frame. When the end is reached, loop to the beginning and continue. 6819 //PARCEL_MEDIA_COMMAND_LOOP Start the media stream playing from the current frame. When the end is reached, loop to the beginning and continue.
6820 //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture. 6820 //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture.
6821 //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url. 6821 //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url.
6822 //PARCEL_MEDIA_COMMAND_TIME float time Move a media stream to a specific time. 6822 //PARCEL_MEDIA_COMMAND_TIME float time Move a media stream to a specific time.
6823 //PARCEL_MEDIA_COMMAND_AGENT key uuid Applies the media command to the specified agent only. 6823 //PARCEL_MEDIA_COMMAND_AGENT key uuid Applies the media command to the specified agent only.
6824 //PARCEL_MEDIA_COMMAND_UNLOAD Completely unloads the movie and restores the original texture. 6824 //PARCEL_MEDIA_COMMAND_UNLOAD Completely unloads the movie and restores the original texture.
6825 //PARCEL_MEDIA_COMMAND_AUTO_ALIGN integer boolean Sets the parcel option 'Auto scale content'. 6825 //PARCEL_MEDIA_COMMAND_AUTO_ALIGN integer boolean Sets the parcel option 'Auto scale content'.
6826 //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later) 6826 //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later)
6827 //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later) 6827 //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later)
6828 //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later) 6828 //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later)
6829 //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later) 6829 //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later)
6830 m_host.AddScriptLPS(1); 6830 m_host.AddScriptLPS(1);
6831 for (int i = 0; i < commandList.Data.Length; i++) 6831 for (int i = 0; i < commandList.Data.Length; i++)
6832 { 6832 {
@@ -6904,12 +6904,12 @@ namespace OpenSim.Region.ScriptEngine.Common
6904 m_host.AddScriptLPS(1); 6904 m_host.AddScriptLPS(1);
6905 LSL_Types.list list = new LSL_Types.list(); 6905 LSL_Types.list list = new LSL_Types.list();
6906 //TO DO: make the implementation for the missing commands 6906 //TO DO: make the implementation for the missing commands
6907 //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture. 6907 //PARCEL_MEDIA_COMMAND_TEXTURE key uuid Use this to get or set the parcel's media texture.
6908 //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url. 6908 //PARCEL_MEDIA_COMMAND_URL string url Used to get or set the parcel's media url.
6909 //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later) 6909 //PARCEL_MEDIA_COMMAND_TYPE string mime_type Use this to get or set the parcel media MIME type (e.g. "text/html"). (1.19.1 RC0 or later)
6910 //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later) 6910 //PARCEL_MEDIA_COMMAND_SIZE integer x, integer y Use this to get or set the parcel media pixel resolution. (1.19.1 RC0 or later)
6911 //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later) 6911 //PARCEL_MEDIA_COMMAND_DESC string desc Use this to get or set the parcel media description. (1.19.1 RC0 or later)
6912 //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later) 6912 //PARCEL_MEDIA_COMMAND_LOOP_SET float loop Use this to get or set the parcel's media loop duration. (1.19.1 RC0 or later)
6913 for (int i = 0; i < aList.Data.Length; i++) 6913 for (int i = 0; i < aList.Data.Length; i++)
6914 { 6914 {
6915 6915
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
index 3b2594d..e98dec6 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_Types.cs
@@ -634,97 +634,97 @@ namespace OpenSim.Region.ScriptEngine.Common
634 } 634 }
635 } 635 }
636 636
637 private class AlphanumComparatorFast : IComparer 637 private class AlphanumComparatorFast : IComparer
638 { 638 {
639 public int Compare(object x, object y) 639 public int Compare(object x, object y)
640 { 640 {
641 string s1 = x as string; 641 string s1 = x as string;
642 if (s1 == null) 642 if (s1 == null)
643 { 643 {
644 return 0; 644 return 0;
645 } 645 }
646 string s2 = y as string; 646 string s2 = y as string;
647 if (s2 == null) 647 if (s2 == null)
648 { 648 {
649 return 0; 649 return 0;
650 } 650 }
651 651
652 int len1 = s1.Length; 652 int len1 = s1.Length;
653 int len2 = s2.Length; 653 int len2 = s2.Length;
654 int marker1 = 0; 654 int marker1 = 0;
655 int marker2 = 0; 655 int marker2 = 0;
656 656
657 // Walk through two the strings with two markers. 657 // Walk through two the strings with two markers.
658 while (marker1 < len1 && marker2 < len2) 658 while (marker1 < len1 && marker2 < len2)
659 { 659 {
660 char ch1 = s1[marker1]; 660 char ch1 = s1[marker1];
661 char ch2 = s2[marker2]; 661 char ch2 = s2[marker2];
662 662
663 // Some buffers we can build up characters in for each chunk. 663 // Some buffers we can build up characters in for each chunk.
664 char[] space1 = new char[len1]; 664 char[] space1 = new char[len1];
665 int loc1 = 0; 665 int loc1 = 0;
666 char[] space2 = new char[len2]; 666 char[] space2 = new char[len2];
667 int loc2 = 0; 667 int loc2 = 0;
668 668
669 // Walk through all following characters that are digits or 669 // Walk through all following characters that are digits or
670 // characters in BOTH strings starting at the appropriate marker. 670 // characters in BOTH strings starting at the appropriate marker.
671 // Collect char arrays. 671 // Collect char arrays.
672 do 672 do
673 { 673 {
674 space1[loc1++] = ch1; 674 space1[loc1++] = ch1;
675 marker1++; 675 marker1++;
676 676
677 if (marker1 < len1) 677 if (marker1 < len1)
678 { 678 {
679 ch1 = s1[marker1]; 679 ch1 = s1[marker1];
680 } 680 }
681 else 681 else
682 { 682 {
683 break; 683 break;
684 } 684 }
685 } while (char.IsDigit(ch1) == char.IsDigit(space1[0])); 685 } while (char.IsDigit(ch1) == char.IsDigit(space1[0]));
686 686
687 do 687 do
688 { 688 {
689 space2[loc2++] = ch2; 689 space2[loc2++] = ch2;
690 marker2++; 690 marker2++;
691 691
692 if (marker2 < len2) 692 if (marker2 < len2)
693 { 693 {
694 ch2 = s2[marker2]; 694 ch2 = s2[marker2];
695 } 695 }
696 else 696 else
697 { 697 {
698 break; 698 break;
699 } 699 }
700 } while (char.IsDigit(ch2) == char.IsDigit(space2[0])); 700 } while (char.IsDigit(ch2) == char.IsDigit(space2[0]));
701 701
702 // If we have collected numbers, compare them numerically. 702 // If we have collected numbers, compare them numerically.
703 // Otherwise, if we have strings, compare them alphabetically. 703 // Otherwise, if we have strings, compare them alphabetically.
704 string str1 = new string(space1); 704 string str1 = new string(space1);
705 string str2 = new string(space2); 705 string str2 = new string(space2);
706 706
707 int result; 707 int result;
708 708
709 if (char.IsDigit(space1[0]) && char.IsDigit(space2[0])) 709 if (char.IsDigit(space1[0]) && char.IsDigit(space2[0]))
710 { 710 {
711 int thisNumericChunk = int.Parse(str1); 711 int thisNumericChunk = int.Parse(str1);
712 int thatNumericChunk = int.Parse(str2); 712 int thatNumericChunk = int.Parse(str2);
713 result = thisNumericChunk.CompareTo(thatNumericChunk); 713 result = thisNumericChunk.CompareTo(thatNumericChunk);
714 } 714 }
715 else 715 else
716 { 716 {
717 result = str1.CompareTo(str2); 717 result = str1.CompareTo(str2);
718 } 718 }
719 719
720 if (result != 0) 720 if (result != 0)
721 { 721 {
722 return result; 722 return result;
723 } 723 }
724 } 724 }
725 return len1 - len2; 725 return len1 - len2;
726 } 726 }
727 } 727 }
728 728
729 public list Sort(int stride, int ascending) 729 public list Sort(int stride, int ascending)
730 { 730 {