diff options
| author | Melanie | 2010-12-12 01:22:50 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-12 01:22:50 +0000 |
| commit | 28022a91986a1357bd17f75b7130cf36f8bc25d1 (patch) | |
| tree | a2ab543fb3d721d76bed78f3aadfdf8f8386948d /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Fixed wrong configuration variable names. (diff) | |
| download | opensim-SC_OLD-28022a91986a1357bd17f75b7130cf36f8bc25d1.zip opensim-SC_OLD-28022a91986a1357bd17f75b7130cf36f8bc25d1.tar.gz opensim-SC_OLD-28022a91986a1357bd17f75b7130cf36f8bc25d1.tar.bz2 opensim-SC_OLD-28022a91986a1357bd17f75b7130cf36f8bc25d1.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 064df35..c08ad3b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -135,7 +135,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 135 | // Parcel commands | 135 | // Parcel commands |
| 136 | void osParcelJoin(vector pos1, vector pos2); | 136 | void osParcelJoin(vector pos1, vector pos2); |
| 137 | void osParcelSubdivide(vector pos1, vector pos2); | 137 | void osParcelSubdivide(vector pos1, vector pos2); |
| 138 | void osParcelSetDetails(vector pos, LSL_List rules); | 138 | void osSetParcelDetails(vector pos, LSL_List rules); |
| 139 | void osParcelSetDetails(vector pos, LSL_List rules); // Deprecated | ||
| 139 | 140 | ||
| 140 | string osGetScriptEngineName(); | 141 | string osGetScriptEngineName(); |
| 141 | string osGetSimulatorVersion(); | 142 | string osGetSimulatorVersion(); |