diff options
| author | Melanie | 2012-04-30 19:04:38 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-30 19:04:38 +0100 |
| commit | 4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6 (patch) | |
| tree | 4a1a8386e77f584c900229f1e8ddb08058d07697 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on an... (diff) | |
| download | opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.zip opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.gz opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.bz2 opensim-SC-4b982db2525c67d3ae5dd9ef8c3e00c4c0d8fdf6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs index 9446099..8db4006 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs | |||
| @@ -376,6 +376,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
| 376 | return m_LSL_Functions.llFrand(mag); | 376 | return m_LSL_Functions.llFrand(mag); |
| 377 | } | 377 | } |
| 378 | 378 | ||
| 379 | public LSL_Key llGenerateKey() | ||
| 380 | { | ||
| 381 | return m_LSL_Functions.llGenerateKey(); | ||
| 382 | } | ||
| 383 | |||
| 379 | public LSL_Vector llGetAccel() | 384 | public LSL_Vector llGetAccel() |
| 380 | { | 385 | { |
| 381 | return m_LSL_Functions.llGetAccel(); | 386 | return m_LSL_Functions.llGetAccel(); |