diff options
| author | Melanie | 2012-01-26 00:21:21 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-26 00:21:21 +0000 |
| commit | 4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf (patch) | |
| tree | 6173c8da92084547e89db40e5762a74249b4a8db /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Typo fix (diff) | |
| parent | refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInvento... (diff) | |
| download | opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.zip opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.gz opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.bz2 opensim-SC_OLD-4ce42762ee2a8ae323b6a1d118bb4b9b0f447caf.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.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 e0027b2..f4de93e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs | |||
| @@ -162,6 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 162 | LSL_List llGetParcelDetails(LSL_Vector pos, LSL_List param); | 162 | LSL_List llGetParcelDetails(LSL_Vector pos, LSL_List param); |
| 163 | LSL_Integer llGetParcelFlags(LSL_Vector pos); | 163 | LSL_Integer llGetParcelFlags(LSL_Vector pos); |
| 164 | LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, int sim_wide); | 164 | LSL_Integer llGetParcelMaxPrims(LSL_Vector pos, int sim_wide); |
| 165 | LSL_String llGetParcelMusicURL(); | ||
| 165 | LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide); | 166 | LSL_Integer llGetParcelPrimCount(LSL_Vector pos, int category, int sim_wide); |
| 166 | LSL_List llGetParcelPrimOwners(LSL_Vector pos); | 167 | LSL_List llGetParcelPrimOwners(LSL_Vector pos); |
| 167 | LSL_Integer llGetPermissions(); | 168 | LSL_Integer llGetPermissions(); |