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/Interface | |
| 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/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs index eab6851..2ecc455 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
| @@ -105,6 +105,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 105 | LSL_Integer llFloor(double f); | 105 | LSL_Integer llFloor(double f); |
| 106 | void llForceMouselook(int mouselook); | 106 | void llForceMouselook(int mouselook); |
| 107 | LSL_Float llFrand(double mag); | 107 | LSL_Float llFrand(double mag); |
| 108 | LSL_Key llGenerateKey(); | ||
| 108 | LSL_Vector llGetAccel(); | 109 | LSL_Vector llGetAccel(); |
| 109 | LSL_Integer llGetAgentInfo(string id); | 110 | LSL_Integer llGetAgentInfo(string id); |
| 110 | LSL_String llGetAgentLanguage(string id); | 111 | LSL_String llGetAgentLanguage(string id); |