aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorMelanie2012-07-20 22:12:02 +0100
committerMelanie2012-07-20 22:12:02 +0100
commit03ff782c3cbefc7ed8582445a1c89f36e643b117 (patch)
tree474fce6662c1d5e54f59289c1a2183ef727251d7 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentMerge branch 'master' into careminster (diff)
parentEnables support for UUIDs to be returned in lists from (diff)
downloadopensim-SC_OLD-03ff782c3cbefc7ed8582445a1c89f36e643b117.zip
opensim-SC_OLD-03ff782c3cbefc7ed8582445a1c89f36e643b117.tar.gz
opensim-SC_OLD-03ff782c3cbefc7ed8582445a1c89f36e643b117.tar.bz2
opensim-SC_OLD-03ff782c3cbefc7ed8582445a1c89f36e643b117.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index b40bdf0..99995a7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -930,5 +930,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
930 { 930 {
931 m_OSSL_Functions.osSetTerrainTextureHeight(corner, low, high); 931 m_OSSL_Functions.osSetTerrainTextureHeight(corner, low, high);
932 } 932 }
933
934 public LSL_Integer osIsUUID(string thing)
935 {
936 return m_OSSL_Functions.osIsUUID(thing);
937 }
933 } 938 }
934} 939}