OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Only bother to create an inventory xfer file if there are any items in a prim inventory

remove-scene-viewer
Justin Clark-Casey (justincc) 2011-09-15 18:42:10 +01:00
parent 8fb3e71b14
commit a4cc5f628f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,8 +866,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
lock (m_items) lock (m_items)
{ {
CreateInventoryFile();
// Don't send a inventory xfer name if there are no items. Doing so causes viewer 3 to crash when rezzing // Don't send a inventory xfer name if there are no items. Doing so causes viewer 3 to crash when rezzing
// a new script if any previous deletion has left the prim inventory empty. // a new script if any previous deletion has left the prim inventory empty.
if (m_items.Count == 0) // No inventory if (m_items.Count == 0) // No inventory
@ -880,6 +878,8 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
} }
CreateInventoryFile();
// In principle, we should only do the rest if the inventory changed; // In principle, we should only do the rest if the inventory changed;
// by sending m_inventorySerial to the client, it ought to know // by sending m_inventorySerial to the client, it ought to know
// that nothing changed and that it doesn't need to request the file. // that nothing changed and that it doesn't need to request the file.