diff options
| author | Justin Clark-Casey (justincc) | 2012-08-02 23:54:32 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-08-02 23:54:32 +0100 |
| commit | 0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81 (patch) | |
| tree | 88d593f56cbaca2c2ba796d87d91f3b5c17c22de /OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |
| parent | Add simple draw test for the VectorRenderModule (diff) | |
| parent | Initialize the Rezzing object to UUID.Zero (diff) | |
| download | opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.zip opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.gz opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.bz2 opensim-SC_OLD-0dfccfc1d9f1e2096eb05508f3e0b60c7b339c81.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | 5 |
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 53daa13..94405d2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
| @@ -945,5 +945,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 945 | { | 945 | { |
| 946 | return m_OSSL_Functions.osMax(a, b); | 946 | return m_OSSL_Functions.osMax(a, b); |
| 947 | } | 947 | } |
| 948 | |||
| 949 | public LSL_Key osGetRezzingObject() | ||
| 950 | { | ||
| 951 | return m_OSSL_Functions.osGetRezzingObject(); | ||
| 952 | } | ||
| 948 | } | 953 | } |
| 949 | } | 954 | } |