4 files changed, 55 insertions, 13 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 23158b9..9564d46 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -12019,35 +12019,50 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return 1;
         }
 
-        #region Not Implemented
-        //
-        // Listing the unimplemented lsl functions here, please move
-        // them from this region as they are completed
-        //
+        public LSL_Integer llGetMemoryLimit()
+        {
+            m_host.AddScriptLPS(1);
+            // The value returned for LSO scripts in SL
+            return 16384;
+        }
 
-        public void llGetEnv(LSL_String name)
+        public LSL_Integer llSetMemoryLimit(LSL_Integer limit)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetEnv");
+            // Treat as an LSO script
+            return ScriptBaseClass.FALSE;
         }
 
-        public void llGetSPMaxMemory()
+        public LSL_Integer llGetSPMaxMemory()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetSPMaxMemory");
+            // The value returned for LSO scripts in SL
+            return 16384;
         }
 
         public virtual LSL_Integer llGetUsedMemory()
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llGetUsedMemory");
-            return 0;
+            // The value returned for LSO scripts in SL
+            return 16384;
         }
 
         public void llScriptProfiler(LSL_Integer flags)
         {
             m_host.AddScriptLPS(1);
-            //NotImplemented("llScriptProfiler");
+            // This does nothing for LSO scripts in SL
+        }
+
+        #region Not Implemented
+        //
+        // Listing the unimplemented lsl functions here, please move
+        // them from this region as they are completed
+        //
+
+        public void llGetEnv(LSL_String name)
+        {
+            m_host.AddScriptLPS(1);
+            NotImplemented("llGetEnv");
         }
 
         public void llSetSoundQueueing(int queue)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 5c528977..eab6851 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -149,7 +149,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
       LSL_Rotation llGetLocalRot();
          LSL_Float llGetMass();
          LSL_Float llGetMassMKS();
-      void llGetNextEmail(string address, string subject);
+       LSL_Integer llGetMemoryLimit();
+              void llGetNextEmail(string address, string subject);
         LSL_String llGetNotecardLine(string name, int line);
            LSL_Key llGetNumberOfNotecardLines(string name);
        LSL_Integer llGetNumberOfPrims();
@@ -187,6 +188,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
         LSL_String llGetScriptName();
        LSL_Integer llGetScriptState(string name);
         LSL_String llGetSimulatorHostname();
+       LSL_Integer llGetSPMaxMemory();
        LSL_Integer llGetStartParameter();
        LSL_Integer llGetStatus(int status);
         LSL_String llGetSubString(string src, int start, int end);
@@ -322,6 +324,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSay(int channelID, string text);
               void llScaleTexture(double u, double v, int face);
        LSL_Integer llScriptDanger(LSL_Vector pos);
+              void llScriptProfiler(LSL_Integer flag);
            LSL_Key llSendRemoteData(string channel, string dest, int idata, string sdata);
               void llSensor(string name, string id, int type, double range, double arc);
               void llSensorRemove();
@@ -345,6 +348,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
               void llSetLinkTexture(int linknumber, string texture, int face);
               void llSetLinkTextureAnim(int linknum, int mode, int face, int sizex, int sizey, double start, double length, double rate);
               void llSetLocalRot(LSL_Rotation rot);
+       LSL_Integer llSetMemoryLimit(LSL_Integer limit);
               void llSetObjectDesc(string desc);
               void llSetObjectName(string name);
               void llSetObjectPermMask(int mask, int value);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
index 6246b57..23b4336 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
@@ -383,6 +383,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
         public const int PRIM_SCULPT_FLAG_INVERT = 64;
         public const int PRIM_SCULPT_FLAG_MIRROR = 128;
 
+        public const int PROFILE_NONE = 0;
+        public const int PROFILE_SCRIPT_MEMORY = 1;
+
         public const int MASK_BASE = 0;
         public const int MASK_OWNER = 1;
         public const int MASK_GROUP = 2;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 70c5fcd..9446099 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -586,6 +586,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetMassMKS();
         }
 
+        public LSL_Integer llGetMemoryLimit()
+        {
+            return m_LSL_Functions.llGetMemoryLimit();
+        }
+
         public void llGetNextEmail(string address, string subject)
         {
             m_LSL_Functions.llGetNextEmail(address, subject);
@@ -776,6 +781,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llGetSimulatorHostname();
         }
 
+        public LSL_Integer llGetSPMaxMemory()
+        {
+            return m_LSL_Functions.llGetSPMaxMemory();
+        }
+
         public LSL_Integer llGetStartParameter()
         {
             return m_LSL_Functions.llGetStartParameter();
@@ -1445,6 +1455,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             return m_LSL_Functions.llScriptDanger(pos);
         }
 
+        public void llScriptProfiler(LSL_Integer flags)
+        {
+            m_LSL_Functions.llScriptProfiler(flags);
+        }
+
         public LSL_Key llSendRemoteData(string channel, string dest, int idata, string sdata)
         {
             return m_LSL_Functions.llSendRemoteData(channel, dest, idata, sdata);
@@ -1555,6 +1570,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
             m_LSL_Functions.llSetLocalRot(rot);
         }
 
+        public LSL_Integer llSetMemoryLimit(LSL_Integer limit)
+        {
+            return m_LSL_Functions.llSetMemoryLimit(limit);
+        }
+
         public void llSetObjectDesc(string desc)
         {
             m_LSL_Functions.llSetObjectDesc(desc);