diff options
author | UbitUmarov | 2019-02-22 22:28:47 +0000 |
---|---|---|
committer | UbitUmarov | 2019-02-22 22:28:47 +0000 |
commit | d89a089ca266311568febc367f41f4217b7580d1 (patch) | |
tree | 64a09adc05082b8f1e093a45fc69d985f359f702 /OpenSim/Region | |
parent | add LSL_Key osGetLastChangedEventKey() ( it is a alias for lldetectedkey(0) b... (diff) | |
download | opensim-SC-d89a089ca266311568febc367f41f4217b7580d1.zip opensim-SC-d89a089ca266311568febc367f41f4217b7580d1.tar.gz opensim-SC-d89a089ca266311568febc367f41f4217b7580d1.tar.bz2 opensim-SC-d89a089ca266311568febc367f41f4217b7580d1.tar.xz |
remove redundant osInventoryDescription() and improve osInventoryDesc() to do the same
Diffstat (limited to '')
3 files changed, 4 insertions, 34 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 7674628..dabd399 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -3890,29 +3890,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3890 | } | 3890 | } |
3891 | 3891 | ||
3892 | /// <summary> | 3892 | /// <summary> |
3893 | /// Get the description from an inventory item | ||
3894 | /// </summary> | ||
3895 | /// <param name="inventoryName"></param> | ||
3896 | /// <returns>Item description</returns> | ||
3897 | public LSL_String osGetInventoryDesc(string item) | ||
3898 | { | ||
3899 | CheckThreatLevel(); | ||
3900 | |||
3901 | lock (m_host.TaskInventory) | ||
3902 | { | ||
3903 | foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) | ||
3904 | { | ||
3905 | if (inv.Value.Name == item) | ||
3906 | { | ||
3907 | return inv.Value.Description.ToString(); | ||
3908 | } | ||
3909 | } | ||
3910 | } | ||
3911 | |||
3912 | return String.Empty; | ||
3913 | } | ||
3914 | |||
3915 | /// <summary> | ||
3916 | /// Invite user to the group this object is set to | 3893 | /// Invite user to the group this object is set to |
3917 | /// </summary> | 3894 | /// </summary> |
3918 | /// <param name="agentId"></param> | 3895 | /// <param name="agentId"></param> |
@@ -5439,7 +5416,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
5439 | return item.Name; | 5416 | return item.Name; |
5440 | } | 5417 | } |
5441 | 5418 | ||
5442 | public LSL_String osGetInventoryDescription(LSL_String itemNameorid) | 5419 | public LSL_String osGetInventoryDesc(LSL_String itemNameorid) |
5443 | { | 5420 | { |
5444 | m_host.AddScriptLPS(1); | 5421 | m_host.AddScriptLPS(1); |
5445 | 5422 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 8333af8..49b3f74 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -401,8 +401,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
401 | 401 | ||
402 | LSL_String osUnixTimeToTimestamp(LSL_Integer time); | 402 | LSL_String osUnixTimeToTimestamp(LSL_Integer time); |
403 | 403 | ||
404 | LSL_String osGetInventoryDesc(string item); | ||
405 | |||
406 | LSL_Integer osInviteToGroup(LSL_Key agentId); | 404 | LSL_Integer osInviteToGroup(LSL_Key agentId); |
407 | LSL_Integer osEjectFromGroup(LSL_Key agentId); | 405 | LSL_Integer osEjectFromGroup(LSL_Key agentId); |
408 | 406 | ||
@@ -549,7 +547,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
549 | LSL_Integer osApproxEquals(rotation ra, rotation rb, LSL_Float margin); | 547 | LSL_Integer osApproxEquals(rotation ra, rotation rb, LSL_Float margin); |
550 | LSL_Key osGetInventoryLastOwner(LSL_String itemNameOrId); | 548 | LSL_Key osGetInventoryLastOwner(LSL_String itemNameOrId); |
551 | LSL_String osGetInventoryName(LSL_Key itemId); | 549 | LSL_String osGetInventoryName(LSL_Key itemId); |
552 | LSL_String osGetInventoryDescription(LSL_String itemNameOrId); | 550 | LSL_String osGetInventoryDesc(LSL_String itemNameOrId); |
553 | LSL_Key osGetLastChangedEventKey(); | 551 | LSL_Key osGetLastChangedEventKey(); |
554 | } | 552 | } |
555 | } | 553 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs index f0fb745..fb491e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs | |||
@@ -1060,11 +1060,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1060 | return m_OSSL_Functions.osUnixTimeToTimestamp(time); | 1060 | return m_OSSL_Functions.osUnixTimeToTimestamp(time); |
1061 | } | 1061 | } |
1062 | 1062 | ||
1063 | public LSL_String osGetInventoryDesc(string item) | ||
1064 | { | ||
1065 | return m_OSSL_Functions.osGetInventoryDesc(item); | ||
1066 | } | ||
1067 | |||
1068 | public LSL_Integer osInviteToGroup(LSL_Key agentId) | 1063 | public LSL_Integer osInviteToGroup(LSL_Key agentId) |
1069 | { | 1064 | { |
1070 | return m_OSSL_Functions.osInviteToGroup(agentId); | 1065 | return m_OSSL_Functions.osInviteToGroup(agentId); |
@@ -1377,9 +1372,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
1377 | return m_OSSL_Functions.osGetInventoryName(itemId); | 1372 | return m_OSSL_Functions.osGetInventoryName(itemId); |
1378 | } | 1373 | } |
1379 | 1374 | ||
1380 | public LSL_String osGetInventoryDescription(LSL_String itemNameOrId) | 1375 | public LSL_String osGetInventoryDesc(LSL_String itemNameOrId) |
1381 | { | 1376 | { |
1382 | return m_OSSL_Functions.osGetInventoryDescription(itemNameOrId); | 1377 | return m_OSSL_Functions.osGetInventoryDesc(itemNameOrId); |
1383 | } | 1378 | } |
1384 | 1379 | ||
1385 | public LSL_Key osGetLastChangedEventKey() | 1380 | public LSL_Key osGetLastChangedEventKey() |