ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-12-25 00:04:46 +00:00
parent b16f4024db b23b29a53e
commit 75010e5e1c
3 changed files with 25 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
View File

@@ -963,15 +963,15 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
Util.StringToBytes256(m_inventoryFileName));
if (!changed)
{
if (m_inventoryFileData.Length > 2)
{
xferManager.AddNewFile(m_inventoryFileName,
m_inventoryFileData);
client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
Util.StringToBytes256(m_inventoryFileName));
Items.LockItemsForRead(false);
return;
}
@@ -1037,6 +1037,9 @@ namespace OpenSim.Region.Framework.Scenes
{
xferManager.AddNewFile(m_inventoryFileName, m_inventoryFileData);
}
client.SendTaskInventory(m_part.UUID, (short)m_inventorySerial,
Util.StringToBytes256(m_inventoryFileName));
}
/// <summary>