diff options
author | Diva Canto | 2009-09-04 22:30:30 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-04 22:30:30 -0700 |
commit | c48ec978179ade68cf816e3134e11ddde71f8bfc (patch) | |
tree | 1e5821597bfb97a84f75789d78f67dd4c2b73fb0 /OpenSim/Region/Framework/Scenes | |
parent | Add ids to iar requests (diff) | |
download | opensim-SC_OLD-c48ec978179ade68cf816e3134e11ddde71f8bfc.zip opensim-SC_OLD-c48ec978179ade68cf816e3134e11ddde71f8bfc.tar.gz opensim-SC_OLD-c48ec978179ade68cf816e3134e11ddde71f8bfc.tar.bz2 opensim-SC_OLD-c48ec978179ade68cf816e3134e11ddde71f8bfc.tar.xz |
Fixed some long-standing issues with appearance in HG1.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs index dd6928f..8fe3565 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGScene.Inventory.cs | |||
@@ -113,26 +113,26 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
113 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 113 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
114 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) | 114 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) |
115 | { | 115 | { |
116 | //m_log.DebugFormat("[HGScene] RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID); | 116 | m_log.DebugFormat("[HGScene] RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID); |
117 | 117 | ||
118 | if (fromTaskID.Equals(UUID.Zero)) | 118 | //if (fromTaskID.Equals(UUID.Zero)) |
119 | //{ | ||
120 | InventoryItemBase item = new InventoryItemBase(itemID); | ||
121 | item.Owner = remoteClient.AgentId; | ||
122 | item = InventoryService.GetItem(item); | ||
123 | //if (item == null) | ||
124 | //{ // Fetch the item | ||
125 | // item = new InventoryItemBase(); | ||
126 | // item.Owner = remoteClient.AgentId; | ||
127 | // item.ID = itemID; | ||
128 | // item = m_assMapper.Get(item, userInfo.RootFolder.ID, userInfo); | ||
129 | //} | ||
130 | if (item != null) | ||
119 | { | 131 | { |
120 | InventoryItemBase item = new InventoryItemBase(itemID); | 132 | m_assMapper.Get(item.AssetID, remoteClient.AgentId); |
121 | item.Owner = remoteClient.AgentId; | 133 | |
122 | item = InventoryService.GetItem(item); | ||
123 | //if (item == null) | ||
124 | //{ // Fetch the item | ||
125 | // item = new InventoryItemBase(); | ||
126 | // item.Owner = remoteClient.AgentId; | ||
127 | // item.ID = itemID; | ||
128 | // item = m_assMapper.Get(item, userInfo.RootFolder.ID, userInfo); | ||
129 | //} | ||
130 | if (item != null) | ||
131 | { | ||
132 | m_assMapper.Get(item.AssetID, remoteClient.AgentId); | ||
133 | |||
134 | } | ||
135 | } | 134 | } |
135 | //} | ||
136 | 136 | ||
137 | // OK, we're done fetching. Pass it up to the default RezObject | 137 | // OK, we're done fetching. Pass it up to the default RezObject |
138 | return base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, | 138 | return base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection, |