aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorCharles Krinke2008-04-18 02:23:48 +0000
committerCharles Krinke2008-04-18 02:23:48 +0000
commitea8b6a28ed2ce004dab7c185c94a16faf96b4fe7 (patch)
tree092575504dabb077ebb3b95bcf7a76696cb197b9 /OpenSim/Region
parent* Re-Fixed caps (diff)
downloadopensim-SC-ea8b6a28ed2ce004dab7c185c94a16faf96b4fe7.zip
opensim-SC-ea8b6a28ed2ce004dab7c185c94a16faf96b4fe7.tar.gz
opensim-SC-ea8b6a28ed2ce004dab7c185c94a16faf96b4fe7.tar.bz2
opensim-SC-ea8b6a28ed2ce004dab7c185c94a16faf96b4fe7.tar.xz
Thank you, Melanie, very kindly for a patch that :
Implements llGetInventoryKey with perms checking. Adds perms checking to llGetTexture, adds type checking to llStartSound, allows llSetTexture to reference textures by name
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs17
1 files changed, 15 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index d8ad914..57a579a 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -2242,8 +2242,21 @@ namespace OpenSim.Region.ScriptEngine.Common
2242 public string llGetInventoryKey(string name) 2242 public string llGetInventoryKey(string name)
2243 { 2243 {
2244 m_host.AddScriptLPS(1); 2244 m_host.AddScriptLPS(1);
2245 NotImplemented("llGetInventoryKey"); 2245 foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
2246 return String.Empty; 2246 {
2247 if(inv.Value.Name == name)
2248 {
2249 if((inv.Value.OwnerMask & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
2250 {
2251 return inv.Value.AssetID.ToString();
2252 }
2253 else
2254 {
2255 return LLUUID.Zero.ToString();
2256 }
2257 }
2258 }
2259 return LLUUID.Zero.ToString();
2247 } 2260 }
2248 2261
2249 public void llAllowInventoryDrop(int add) 2262 public void llAllowInventoryDrop(int add)