ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Thank you, Snowdrop, for a patch that makes the callback ID parameter

Browse Source 
usable. Applied with formatting changes, please don't introduce
K&R style indentations into OpenSim
Fixes Mantis #3190
This commit is contained in:
Melanie Thielker
2009-02-19 03:09:56 +00:00
parent 7e0e9ef179
commit 863556f2cc
8 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
View File

@@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Scenes
if (userInfo != null)
{
AddInventoryItem(remoteClient.AgentId, item);
remoteClient.SendInventoryItemCreateUpdate(item);
remoteClient.SendInventoryItemCreateUpdate(item, 0);
}
else
{
@@ -846,7 +846,7 @@ namespace OpenSim.Region.Framework.Scenes
item.CreationDate = creationDate;
userInfo.AddItem(item);
remoteClient.SendInventoryItemCreateUpdate(item);
remoteClient.SendInventoryItemCreateUpdate(item, callbackID);
}
else
{
@@ -1379,6 +1379,7 @@ namespace OpenSim.Region.Framework.Scenes
if (part != null)
{
TaskInventoryItem currentItem = part.Inventory.GetInventoryItem(itemID);
bool allowInventoryDrop = (part.GetEffectiveObjectFlags()
& (uint)PrimFlags.AllowInventoryDrop) != 0;
@@ -2003,14 +2004,14 @@ namespace OpenSim.Region.Framework.Scenes
if (remoteClient != null && item.Owner == remoteClient.AgentId)
{
remoteClient.SendInventoryItemCreateUpdate(item);
remoteClient.SendInventoryItemCreateUpdate(item, 0);
}
else
{
ScenePresence notifyUser = GetScenePresence(item.Owner);
if (notifyUser != null)
{
notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item);
notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
}
}
}
@@ -2092,7 +2093,7 @@ namespace OpenSim.Region.Framework.Scenes
// this gets called when the agent loggs off!
if (remoteClient != null)
{
remoteClient.SendInventoryItemCreateUpdate(item);
remoteClient.SendInventoryItemCreateUpdate(item, 0);
}
}
}
@@ -2151,7 +2152,7 @@ namespace OpenSim.Region.Framework.Scenes
grp.SetFromAssetID(item.ID);
userInfo.AddItem(item);
remoteClient.SendInventoryItemCreateUpdate(item);
remoteClient.SendInventoryItemCreateUpdate(item, 0);
itemID = item.ID;
return item.AssetID;

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -3581,7 +3581,7 @@ namespace OpenSim.Region.Framework.Scenes
item.CreationDate = Util.UnixTimeSinceEpoch();
userInfo.AddItem(item);
remoteClient.SendInventoryItemCreateUpdate(item);
remoteClient.SendInventoryItemCreateUpdate(item, 0);
}
else
{