aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorDiva Canto2009-08-18 22:17:47 -0700
committerDiva Canto2009-08-18 22:17:47 -0700
commit124f66bfc25984a01491b8447fa97bea2633281c (patch)
tree9f6ba47c216457b39a2e5c7bb921e41afa71d795 /OpenSim/Region/Framework/Scenes
parentAdded new OpenSim.ini setting: "client_throttle_max_bps" which overrides user... (diff)
downloadopensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.zip
opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.gz
opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.bz2
opensim-SC_OLD-124f66bfc25984a01491b8447fa97bea2633281c.tar.xz
jhurliman's patch in http://opensimulator.org/mantis/view.php?id=4024
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs35
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs3
2 files changed, 25 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 46777e1..48c7f4e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -140,7 +140,8 @@ namespace OpenSim.Region.Framework.Scenes
140 /// <returns></returns> 140 /// <returns></returns>
141 public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data) 141 public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data)
142 { 142 {
143 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 143 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
144 item = InventoryService.GetItem(item);
144 145
145 if (item != null) 146 if (item != null)
146 { 147 {
@@ -315,7 +316,8 @@ namespace OpenSim.Region.Framework.Scenes
315 public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID, 316 public void UpdateInventoryItemAsset(IClientAPI remoteClient, UUID transactionID,
316 UUID itemID, InventoryItemBase itemUpd) 317 UUID itemID, InventoryItemBase itemUpd)
317 { 318 {
318 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 319 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
320 item = InventoryService.GetItem(item);
319 321
320 if (item != null) 322 if (item != null)
321 { 323 {
@@ -408,7 +410,8 @@ namespace OpenSim.Region.Framework.Scenes
408 { 410 {
409 Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem"); 411 Console.WriteLine("Scene.Inventory.cs: GiveInventoryItem");
410 412
411 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemId)); 413 InventoryItemBase item = new InventoryItemBase(itemId, senderId);
414 item = InventoryService.GetItem(item);
412 415
413 if ((item != null) && (item.Owner == senderId)) 416 if ((item != null) && (item.Owner == senderId))
414 { 417 {
@@ -558,7 +561,8 @@ namespace OpenSim.Region.Framework.Scenes
558 561
559 if (item == null) 562 if (item == null)
560 { 563 {
561 item = InventoryService.GetItem(new InventoryItemBase(oldItemID)); 564 item = new InventoryItemBase(oldItemID, remoteClient.AgentId);
565 item = InventoryService.GetItem(item);
562 566
563 if (item == null) 567 if (item == null)
564 { 568 {
@@ -636,7 +640,8 @@ namespace OpenSim.Region.Framework.Scenes
636 m_log.DebugFormat( 640 m_log.DebugFormat(
637 "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId); 641 "[AGENT INVENTORY]: Moving item {0} to {1} for {2}", itemID, folderID, remoteClient.AgentId);
638 642
639 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 643 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
644 item = InventoryService.GetItem(item);
640 645
641 if (item != null) 646 if (item != null)
642 { 647 {
@@ -1224,7 +1229,8 @@ namespace OpenSim.Region.Framework.Scenes
1224 UUID copyID = UUID.Random(); 1229 UUID copyID = UUID.Random();
1225 if (itemID != UUID.Zero) 1230 if (itemID != UUID.Zero)
1226 { 1231 {
1227 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 1232 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
1233 item = InventoryService.GetItem(item);
1228 1234
1229 // Try library 1235 // Try library
1230 if (null == item) 1236 if (null == item)
@@ -1287,7 +1293,8 @@ namespace OpenSim.Region.Framework.Scenes
1287 1293
1288 if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory 1294 if (itemID != UUID.Zero) // transferred from an avatar inventory to the prim's inventory
1289 { 1295 {
1290 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 1296 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
1297 item = InventoryService.GetItem(item);
1291 1298
1292 // Try library 1299 // Try library
1293 // XXX clumsy, possibly should be one call 1300 // XXX clumsy, possibly should be one call
@@ -1672,7 +1679,7 @@ namespace OpenSim.Region.Framework.Scenes
1672 1679
1673 if (DeRezAction.SaveToExistingUserInventoryItem == action) 1680 if (DeRezAction.SaveToExistingUserInventoryItem == action)
1674 { 1681 {
1675 item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID); 1682 item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID, userID);
1676 item = InventoryService.GetItem(item); 1683 item = InventoryService.GetItem(item);
1677 1684
1678 //item = userInfo.RootFolder.FindItem( 1685 //item = userInfo.RootFolder.FindItem(
@@ -1834,7 +1841,8 @@ namespace OpenSim.Region.Framework.Scenes
1834 1841
1835 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup); 1842 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
1836 1843
1837 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 1844 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
1845 item = InventoryService.GetItem(item);
1838 1846
1839 if (item != null) 1847 if (item != null)
1840 { 1848 {
@@ -1984,7 +1992,8 @@ namespace OpenSim.Region.Framework.Scenes
1984 BypassRayCast, bRayEndIsIntersection,true,scale, false); 1992 BypassRayCast, bRayEndIsIntersection,true,scale, false);
1985 1993
1986 // Rez object 1994 // Rez object
1987 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 1995 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
1996 item = InventoryService.GetItem(item);
1988 1997
1989 if (item != null) 1998 if (item != null)
1990 { 1999 {
@@ -2309,7 +2318,8 @@ namespace OpenSim.Region.Framework.Scenes
2309 ScenePresence presence; 2318 ScenePresence presence;
2310 if (TryGetAvatar(remoteClient.AgentId, out presence)) 2319 if (TryGetAvatar(remoteClient.AgentId, out presence))
2311 { 2320 {
2312 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID, remoteClient.AgentId)); 2321 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2322 item = InventoryService.GetItem(item);
2313 2323
2314 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 2324 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
2315 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); 2325 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
@@ -2360,7 +2370,8 @@ namespace OpenSim.Region.Framework.Scenes
2360 if (TryGetAvatar(remoteClient.AgentId, out presence)) 2370 if (TryGetAvatar(remoteClient.AgentId, out presence))
2361 { 2371 {
2362 // XXYY!! 2372 // XXYY!!
2363 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 2373 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
2374 item = InventoryService.GetItem(item);
2364 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); 2375 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
2365 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>(); 2376 IAvatarFactory ava = RequestModuleInterface<IAvatarFactory>();
2366 if (ava != null) 2377 if (ava != null)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index fde922f..1bbca49 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -404,7 +404,8 @@ namespace OpenSim.Region.Framework.Scenes
404 return; 404 return;
405 } 405 }
406 406
407 InventoryItemBase item = InventoryService.GetItem(new InventoryItemBase(itemID)); 407 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
408 item = InventoryService.GetItem(item);
408 409
409 if (item != null) 410 if (item != null)
410 { 411 {