aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2013-03-15 23:46:49 +0000
committerMelanie2013-03-15 23:46:49 +0000
commit7e5d5537815d5626387d8638da769192ab3c7ca8 (patch)
tree083b44d94a7a5d6a1fc3257833e713fc3b9affc6 /OpenSim
parentChange the table and field names of XAssetService mysql db tables to be capit... (diff)
downloadopensim-SC_OLD-7e5d5537815d5626387d8638da769192ab3c7ca8.zip
opensim-SC_OLD-7e5d5537815d5626387d8638da769192ab3c7ca8.tar.gz
opensim-SC_OLD-7e5d5537815d5626387d8638da769192ab3c7ca8.tar.bz2
opensim-SC_OLD-7e5d5537815d5626387d8638da769192ab3c7ca8.tar.xz
Make the LSL memory functions virtual so script engines can override them if they have different memory management.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8adf4d9..f07b645 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -6068,7 +6068,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6068 return m_host.ParentGroup.AttachmentPoint; 6068 return m_host.ParentGroup.AttachmentPoint;
6069 } 6069 }
6070 6070
6071 public LSL_Integer llGetFreeMemory() 6071 public virtual LSL_Integer llGetFreeMemory()
6072 { 6072 {
6073 m_host.AddScriptLPS(1); 6073 m_host.AddScriptLPS(1);
6074 // Make scripts designed for LSO happy 6074 // Make scripts designed for LSO happy
@@ -11560,7 +11560,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11560 return 16384; 11560 return 16384;
11561 } 11561 }
11562 11562
11563 public LSL_Integer llGetUsedMemory() 11563 public virtual LSL_Integer llGetUsedMemory()
11564 { 11564 {
11565 m_host.AddScriptLPS(1); 11565 m_host.AddScriptLPS(1);
11566 // The value returned for LSO scripts in SL 11566 // The value returned for LSO scripts in SL
@@ -11790,4 +11790,4 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
11790 } 11790 }
11791 } 11791 }
11792 } 11792 }
11793} \ No newline at end of file 11793}