aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
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/Runtime
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/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 0c05ea4..fc83786 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -452,6 +452,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
452 return m_OSSL_Functions.osGetGridLoginURI(); 452 return m_OSSL_Functions.osGetGridLoginURI();
453 } 453 }
454 454
455 public string osGetGridCustom(string key)
456 {
457 return m_OSSL_Functions.osGetGridCustom(key);
458 }
459
455 public LSL_String osFormatString(string str, LSL_List strings) 460 public LSL_String osFormatString(string str, LSL_List strings)
456 { 461 {
457 return m_OSSL_Functions.osFormatString(str, strings); 462 return m_OSSL_Functions.osFormatString(str, strings);