aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface
diff options
context:
space:
mode:
authorDiva Canto2012-03-17 10:00:43 -0700
committerDiva Canto2012-03-17 10:00:43 -0700
commitd87a5758fb648b5e314950ac35050fbf5af9e3df (patch)
tree4cb978de354d265418187d4edb30b54dddf21448 /OpenSim/Region/ScriptEngine/Shared/Api/Interface
parentRegion access control! Region operators can now specify things like DisallowF... (diff)
parentAdd osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927 (diff)
downloadopensim-SC-d87a5758fb648b5e314950ac35050fbf5af9e3df.zip
opensim-SC-d87a5758fb648b5e314950ac35050fbf5af9e3df.tar.gz
opensim-SC-d87a5758fb648b5e314950ac35050fbf5af9e3df.tar.bz2
opensim-SC-d87a5758fb648b5e314950ac35050fbf5af9e3df.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
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 a5b906f..8f9efc0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -229,5 +229,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
229 LSL_List osGetAvatarList(); 229 LSL_List osGetAvatarList();
230 230
231 LSL_String osUnixTimeToTimestamp(long time); 231 LSL_String osUnixTimeToTimestamp(long time);
232
233 LSL_String osGetInventoryDesc(string item);
232 } 234 }
233} 235}