3 files changed, 33 insertions, 32 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7c19ad7..c2b16cf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1920,7 +1920,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return (double)((ScriptTime.TotalMilliseconds / 1000)*World.TimeDilation);
         }
 
-        public void llSound()
+        public void llSound(string sound, double volume, int queue, int loop)
         {
             m_host.AddScriptLPS(1);
             // This function has been deprecated
@@ -2287,28 +2287,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return 0;
         }
 
-        public void llMakeExplosion()
+        public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
             Deprecated("llMakeExplosion");
             // ScriptSleep(100);
         }
 
-        public void llMakeFountain()
+        public void llMakeFountain(int particles, float scale, float vel, float lifetime, float arc, int bounce, string texture, LSL_Vector offset, float bounce_offset)
         {
             m_host.AddScriptLPS(1);
             Deprecated("llMakeFountain");
             // ScriptSleep(100);
         }
 
-        public void llMakeSmoke()
+        public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
             Deprecated("llMakeSmoke");
             // ScriptSleep(100);
         }
 
-        public void llMakeFire()
+        public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
             m_host.AddScriptLPS(1);
             Deprecated("llMakeFire");
@@ -2707,7 +2707,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public void llPointAt()
+        public void llPointAt(LSL_Vector pos)
         {
             m_host.AddScriptLPS(1);
             NotImplemented("llPointAt");
@@ -6148,11 +6148,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
         }
 
-        public void llXorBase64Strings()
+        public LSL_String llXorBase64Strings(string str1, string str2)
         {
             m_host.AddScriptLPS(1);
             Deprecated("llXorBase64Strings");
             // ScriptSleep(300);
+            return String.Empty;
         }
 
         public void llRemoteDataSetRegion()
@@ -7583,7 +7584,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new LSL_Rotation();
         }
 
-        public void llSetPrimURL()
+        public void llSetPrimURL(string url)
         {
             m_host.AddScriptLPS(1);
             NotImplemented("llSetPrimURL");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 812f2ff..5670988 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -228,10 +228,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llLoopSound(string sound, double volume);
               void llLoopSoundMaster(string sound, double volume);
               void llLoopSoundSlave(string sound, double volume);
-              void llMakeExplosion();
-              void llMakeFire();
-              void llMakeFountain();
-              void llMakeSmoke();
+              void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
+              void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
+              void llMakeFountain(int particles, float scale, float vel, float lifetime, float arc, int bounce, string texture, LSL_Vector offset, float bounce_offset);
+              void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
               void llMapDestination(string simname, LSL_Vector pos, LSL_Vector look_at);
         LSL_String llMD5String(string src, int nonce);
               void llMessageLinked(int linknum, int num, string str, string id);
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llPassTouches(int pass);
               void llPlaySound(string sound, double volume);
               void llPlaySoundSlave(string sound, double volume);
-              void llPointAt();
+              void llPointAt(LSL_Vector pos);
          LSL_Float llPow(double fbase, double fexponent);
               void llPreloadSound(string sound);
               void llPushObject(string target, LSL_Vector impulse, LSL_Vector ang_impulse, int local);
@@ -323,7 +323,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetPayPrice(int price, LSL_List quick_pay_buttons);
               void llSetPos(LSL_Vector pos);
               void llSetPrimitiveParams(LSL_List rules);
-              void llSetPrimURL();
+              void llSetPrimURL(string url);
               void llSetRemoteScriptAccessPin(int pin);
               void llSetRot(LSL_Rotation rot);
               void llSetScale(LSL_Vector scale);
@@ -347,7 +347,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
          LSL_Float llSin(double f);
               void llSitTarget(LSL_Vector offset, LSL_Rotation rot);
               void llSleep(double sec);
-              void llSound();
+              void llSound(string sound, double volume, int queue, int loop);
               void llSoundPreload(string sound);
          LSL_Float llSqrt(double f);
               void llStartAnimation(string anim);
@@ -382,7 +382,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
          LSL_Float llWater(LSL_Vector offset);
               void llWhisper(int channelID, string text);
         LSL_Vector llWind(LSL_Vector offset);
-              void llXorBase64Strings();
+        LSL_String llXorBase64Strings(string str1, string str2);
         LSL_String llXorBase64StringsCorrect(string str1, string str2);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index bebb011..52916b5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -999,24 +999,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llLoopSoundSlave(sound, volume);
         }
 
-        public void llMakeExplosion()
+        public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
-            m_LSL_Functions.llMakeExplosion();
+            m_LSL_Functions.llMakeExplosion(particles, scale, vel, lifetime, arc, texture, offset);
         }
 
-        public void llMakeFire()
+        public void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
-            m_LSL_Functions.llMakeFire();
+            m_LSL_Functions.llMakeFire(particles, scale, vel, lifetime, arc, texture, offset);
         }
 
-        public void llMakeFountain()
+        public void llMakeFountain(int particles, float scale, float vel, float lifetime, float arc, int bounce, string texture, LSL_Vector offset, float bounce_offset)
         {
-            m_LSL_Functions.llMakeFountain();
+            m_LSL_Functions.llMakeFountain(particles, scale, vel, lifetime, arc, bounce, texture, offset, bounce_offset);
         }
 
-        public void llMakeSmoke()
+        public void llMakeSmoke(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
         {
-            m_LSL_Functions.llMakeSmoke();
+            m_LSL_Functions.llMakeSmoke(particles, scale, vel, lifetime, arc, texture, offset);
         }
 
         public void llMapDestination(string simname, LSL_Vector pos, LSL_Vector look_at)
@@ -1119,9 +1119,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llPlaySoundSlave(sound, volume);
         }
 
-        public void llPointAt()
+        public void llPointAt(LSL_Vector pos)
         {
-            m_LSL_Functions.llPointAt();
+            m_LSL_Functions.llPointAt(pos);
         }
 
         public LSL_Float llPow(double fbase, double fexponent)
@@ -1474,9 +1474,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetPrimitiveParams(rules);
         }
 
-        public void llSetPrimURL()
+        public void llSetPrimURL(string url)
         {
-            m_LSL_Functions.llSetPrimURL();
+            m_LSL_Functions.llSetPrimURL(url);
         }
 
         public void llSetRemoteScriptAccessPin(int pin)
@@ -1594,9 +1594,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSleep(sec);
         }
 
-        public void llSound()
+        public void llSound(string sound, double volume, int queue, int loop)
         {
-            m_LSL_Functions.llSound();
+            m_LSL_Functions.llSound(sound, volume, queue, loop);
         }
 
         public void llSoundPreload(string sound)
@@ -1769,9 +1769,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llWind(offset);
         }
 
-        public void llXorBase64Strings()
+        public LSL_String llXorBase64Strings(string str1, string str2)
         {
-            m_LSL_Functions.llXorBase64Strings();
+            return m_LSL_Functions.llXorBase64Strings(str1, str2);
         }
 
         public LSL_String llXorBase64StringsCorrect(string str1, string str2)