diff options
author | Diva Canto | 2009-08-15 09:36:45 -0700 |
---|---|---|
committer | Diva Canto | 2009-08-15 09:36:45 -0700 |
commit | 1bbf06405c109a4299a9494555f8223dd954610b (patch) | |
tree | 6f1188d2ebabddd7969604ccff9128fdcb11ad1f /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-1bbf06405c109a4299a9494555f8223dd954610b.zip opensim-SC-1bbf06405c109a4299a9494555f8223dd954610b.tar.gz opensim-SC-1bbf06405c109a4299a9494555f8223dd954610b.tar.bz2 opensim-SC-1bbf06405c109a4299a9494555f8223dd954610b.tar.xz |
Changed FromAssetID to FromItemID
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a941a74..cea9044 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1906,8 +1906,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1906 | } | 1906 | } |
1907 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 1907 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
1908 | 1908 | ||
1909 | // sets assetID so client can show asset as 'attached' in inventory | 1909 | // sets itemID so client can show item as 'attached' in inventory |
1910 | grp.SetFromAssetID(item.ID); | 1910 | grp.SetFromItemID(item.ID); |
1911 | 1911 | ||
1912 | if (InventoryService.AddItem(item)) | 1912 | if (InventoryService.AddItem(item)) |
1913 | remoteClient.SendInventoryItemCreateUpdate(item, 0); | 1913 | remoteClient.SendInventoryItemCreateUpdate(item, 0); |
@@ -2044,7 +2044,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2044 | } | 2044 | } |
2045 | else | 2045 | else |
2046 | { | 2046 | { |
2047 | group.SetFromAssetID(itemID); | 2047 | group.SetFromItemID(itemID); |
2048 | } | 2048 | } |
2049 | 2049 | ||
2050 | SceneObjectPart rootPart = null; | 2050 | SceneObjectPart rootPart = null; |
@@ -2373,7 +2373,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2373 | if (part == null || part.ParentGroup == null) | 2373 | if (part == null || part.ParentGroup == null) |
2374 | return; | 2374 | return; |
2375 | 2375 | ||
2376 | UUID inventoryID = part.ParentGroup.GetFromAssetID(); | 2376 | UUID inventoryID = part.ParentGroup.GetFromItemID(); |
2377 | 2377 | ||
2378 | ScenePresence presence; | 2378 | ScenePresence presence; |
2379 | if (TryGetAvatar(remoteClient.AgentId, out presence)) | 2379 | if (TryGetAvatar(remoteClient.AgentId, out presence)) |