Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge

avinationmerge
Melanie 2011-10-11 23:22:08 +01:00
commit 3359bafc3e
1 changed files with 16 additions and 1 deletions

View File

@ -2116,11 +2116,26 @@ 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
{