aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface
diff options
context:
space:
mode:
authorBlueWall2012-01-17 22:44:16 -0500
committerBlueWall2012-01-17 22:44:16 -0500
commite7619f75180d9d919bb7d077183596265f8d52a9 (patch)
tree71e5b0bd820cb48eeebd738450373dc7546ff5b5 /OpenSim/Region/ScriptEngine/Shared/Api/Interface
parentMerge branch 'master' of /home/opensim/src/opensim (diff)
parentAdd function osGetGridCustom (diff)
downloadopensim-SC_OLD-e7619f75180d9d919bb7d077183596265f8d52a9.zip
opensim-SC_OLD-e7619f75180d9d919bb7d077183596265f8d52a9.tar.gz
opensim-SC_OLD-e7619f75180d9d919bb7d077183596265f8d52a9.tar.bz2
opensim-SC_OLD-e7619f75180d9d919bb7d077183596265f8d52a9.tar.xz
Merge branch 'master' of /home/opensim/src/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs1
1 files changed, 1 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 af6be5f..c1c4511 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -160,6 +160,7 @@ 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 osGetGridCustom(string key);
163 164
164 LSL_String osFormatString(string str, LSL_List strings); 165 LSL_String osFormatString(string str, LSL_List strings);
165 LSL_List osMatchString(string src, string pattern, int start); 166 LSL_List osMatchString(string src, string pattern, int start);