Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 18 insertions, 3 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 4b2fb51..04762be 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1912,15 +1912,30 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
                 face = 0;
             }
+
             if (face >= 0 && face < GetNumberOfSides(part))
             {
                 Primitive.TextureEntryFace texface;
                 texface = tex.GetFace((uint)face);
-                return texface.TextureID.ToString();
+                string texture = texface.TextureID.ToString();
+
+                lock (part.TaskInventory)
+                {
+                    foreach (KeyValuePair<UUID, TaskInventoryItem> inv in part.TaskInventory)
+                    {
+                        if (inv.Value.AssetID == texface.TextureID)
+                        {
+                            texture = inv.Value.Name.ToString();
+                            break;
+                        }
+                    }
+                }
+
+                return texture;
             }
             else
             {
-                return String.Empty;
+                return UUID.Zero.ToString();
             }
         }
 
@@ -4224,8 +4239,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
         public void llCollisionSound(string impact_sound, double impact_volume)
         {
-
             m_host.AddScriptLPS(1);
+            
             // TODO: Parameter check logic required.
             UUID soundId = UUID.Zero;
             if (!UUID.TryParse(impact_sound, out soundId))