diff options
| author | Melanie | 2012-08-03 16:46:11 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-03 16:46:11 +0100 |
| commit | 0c00abcce18d00ae151a7340b808ffe8d7e200ef (patch) | |
| tree | 3f19d7653c984120f16b3a2ea74ccf6b34928a2e /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match FromFolderID,... (diff) | |
| download | opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.zip opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.gz opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.bz2 opensim-SC-0c00abcce18d00ae151a7340b808ffe8d7e200ef.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -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 | } |