aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Common
diff options
context:
space:
mode:
authorAdam Frisby2008-04-06 13:48:28 +0000
committerAdam Frisby2008-04-06 13:48:28 +0000
commit996309a6e1ee47d96d81c0bdfdd5bfc27db66efd (patch)
tree9b9208a28969785a459e30de3ce9f260beb26201 /OpenSim/Region/ScriptEngine/Common
parent* Fixed up some documentation (diff)
downloadopensim-SC_OLD-996309a6e1ee47d96d81c0bdfdd5bfc27db66efd.zip
opensim-SC_OLD-996309a6e1ee47d96d81c0bdfdd5bfc27db66efd.tar.gz
opensim-SC_OLD-996309a6e1ee47d96d81c0bdfdd5bfc27db66efd.tar.bz2
opensim-SC_OLD-996309a6e1ee47d96d81c0bdfdd5bfc27db66efd.tar.xz
* Various terrain engine fixes
* Includes patch #894 fixes for terrain load-tile * Large number of other terrain fixes and new commands included.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs13
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs4
3 files changed, 36 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
index c878e7c..3f6f5cc 100644
--- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
+++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
@@ -1916,6 +1916,19 @@ namespace OpenSim.Region.ScriptEngine.Common
1916 m_LSL_Functions.osSetPrimFloatOnWater(floatYN); 1916 m_LSL_Functions.osSetPrimFloatOnWater(floatYN);
1917 } 1917 }
1918 1918
1919 // Animation Functions
1920
1921 public void osAvatarPlayAnimation(string avatar, string animation)
1922 {
1923 m_LSL_Functions.osAvatarPlayAnimation(avatar, animation);
1924 }
1925
1926 public void osAvatarStopAnimation(string avatar, string animation)
1927 {
1928 m_LSL_Functions.osAvatarStopAnimation(avatar, animation);
1929 }
1930
1931
1919 //Texture Draw functions 1932 //Texture Draw functions
1920 1933
1921 public string osMovePen(string drawList, int x, int y) 1934 public string osMovePen(string drawList, int x, int y)
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 76be7cf..9567d80 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -5119,6 +5119,25 @@ namespace OpenSim.Region.ScriptEngine.Common
5119 } 5119 }
5120 } 5120 }
5121 5121
5122 // Adam's super super custom animation functions
5123 public void osAvatarPlayAnimation(string avatar, string animation)
5124 {
5125 if (World.Entities.ContainsKey(avatar) && World.Entities[avatar] is ScenePresence)
5126 {
5127 ScenePresence target = (ScenePresence)World.Entities[avatar];
5128 target.AddAnimation(avatar, 0);
5129 }
5130 }
5131
5132 public void osAvatarStopAnimation(string avatar, string animation)
5133 {
5134 if (World.Entities.ContainsKey(avatar) && World.Entities[avatar] is ScenePresence)
5135 {
5136 ScenePresence target = (ScenePresence)World.Entities[avatar];
5137 target.RemoveAnimation(animation);
5138 }
5139 }
5140
5122 //Texture draw functions 5141 //Texture draw functions
5123 public string osMovePen(string drawList, int x, int y) 5142 public string osMovePen(string drawList, int x, int y)
5124 { 5143 {
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
index 9708941..4e632ef 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
@@ -653,6 +653,10 @@ namespace OpenSim.Region.ScriptEngine.Common
653 void osSetParcelMediaURL(string url); 653 void osSetParcelMediaURL(string url);
654 void osSetPrimFloatOnWater(int floatYN); 654 void osSetPrimFloatOnWater(int floatYN);
655 655
656 // Animation commands
657 void osAvatarPlayAnimation(string avatar, string animation);
658 void osAvatarStopAnimation(string avatar, string animation);
659
656 //texture draw functions 660 //texture draw functions
657 string osMovePen(string drawList, int x, int y); 661 string osMovePen(string drawList, int x, int y);
658 string osDrawLine(string drawList, int startX, int startY, int endX, int endY); 662 string osDrawLine(string drawList, int startX, int startY, int endX, int endY);