diff options
| author | Melanie | 2012-01-21 19:52:33 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-21 19:52:33 +0000 |
| commit | ba3b0c69f11aaa3b4305cddd57099e98325a146d (patch) | |
| tree | cf70355a8cac0579354e67eeb3632a6706d41012 /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
| parent | Add some logging (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.zip opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.gz opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.bz2 opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.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, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 403e491..6388704 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
| @@ -160,6 +160,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
| 160 | string osGetGridNick(); | 160 | string osGetGridNick(); |
| 161 | string osGetGridName(); | 161 | string osGetGridName(); |
| 162 | string osGetGridLoginURI(); | 162 | string osGetGridLoginURI(); |
| 163 | string osGetGridHomeURI(); | ||
| 164 | string osGetGridCustom(string key); | ||
| 163 | 165 | ||
| 164 | LSL_String osFormatString(string str, LSL_List strings); | 166 | LSL_String osFormatString(string str, LSL_List strings); |
| 165 | LSL_List osMatchString(string src, string pattern, int start); | 167 | LSL_List osMatchString(string src, string pattern, int start); |