diff options
| author | Melanie | 2010-01-03 21:43:39 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-03 21:43:39 +0000 |
| commit | 61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11 (patch) | |
| tree | 7780b88dc26de91fe0b95a0a234a7f995adf5d22 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Add virtual method StateChange to ScriptBaseClass (diff) | |
| parent | Cause llSetText to send prim updates. (diff) | |
| download | opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.zip opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.gz opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.bz2 opensim-SC_OLD-61ce884336f0cd20b7ecf85e9a6c8a54ad1f8d11.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 |
1 files changed, 1 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 5e20f7d..f5921e1 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -162,7 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 162 | 162 | ||
| 163 | key osGetMapTexture(); | 163 | key osGetMapTexture(); |
| 164 | key osGetRegionMapTexture(string regionName); | 164 | key osGetRegionMapTexture(string regionName); |
| 165 | LSL_List osGetRegionStats(); | 165 | LSL_List osGetRegionStats(); |
| 166 | 166 | ||
| 167 | int osGetSimulatorMemory(); | 167 | int osGetSimulatorMemory(); |
| 168 | void osKickAvatar(string FirstName,string SurName,string alert); | 168 | void osKickAvatar(string FirstName,string SurName,string alert); |