diff options
author | Diva Canto | 2010-07-05 07:14:32 -0700 |
---|---|---|
committer | Diva Canto | 2010-07-05 07:14:32 -0700 |
commit | debc780654dba27acdef0de384d0db4b586b02be (patch) | |
tree | 085808fb0e2df5095e54c4b67b70b2889e8c804d /OpenSim/Region/CoreModules | |
parent | Don't include hyperlinks as neighbors, even if grid operators have done the m... (diff) | |
download | opensim-SC_OLD-debc780654dba27acdef0de384d0db4b586b02be.zip opensim-SC_OLD-debc780654dba27acdef0de384d0db4b586b02be.tar.gz opensim-SC_OLD-debc780654dba27acdef0de384d0db4b586b02be.tar.bz2 opensim-SC_OLD-debc780654dba27acdef0de384d0db4b586b02be.tar.xz |
Fixes additional bug reported in mantis #4841.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs index cd66af5..8ccc941 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs | |||
@@ -131,7 +131,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
131 | return ret; | 131 | return ret; |
132 | } | 132 | } |
133 | 133 | ||
134 | // DO NOT OVERRIDE THIS METHOD | 134 | // DO NOT OVERRIDE THE BASE METHOD |
135 | public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID, | 135 | public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID, |
136 | SceneObjectGroup objectGroup, IClientAPI remoteClient) | 136 | SceneObjectGroup objectGroup, IClientAPI remoteClient) |
137 | { | 137 | { |
@@ -139,7 +139,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
139 | 139 | ||
140 | if (!assetID.Equals(UUID.Zero)) | 140 | if (!assetID.Equals(UUID.Zero)) |
141 | { | 141 | { |
142 | UploadInventoryItem(remoteClient.AgentId, assetID, "", 0); | 142 | if (remoteClient != null) |
143 | UploadInventoryItem(remoteClient.AgentId, assetID, "", 0); | ||
143 | } | 144 | } |
144 | else | 145 | else |
145 | m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); | 146 | m_log.Debug("[HGScene]: Scene.Inventory did not create asset"); |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index e09db15..4ec5253 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs | |||
@@ -202,9 +202,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
202 | } | 202 | } |
203 | } | 203 | } |
204 | } | 204 | } |
205 | |||
206 | // else put a null; it means that the methods should forward to local grid's inventory | ||
207 | m_InventoryURLs.Add(userID, null); | ||
208 | } | 205 | } |
209 | 206 | ||
210 | private void DropInventoryServiceURL(UUID userID) | 207 | private void DropInventoryServiceURL(UUID userID) |
@@ -223,10 +220,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory | |||
223 | if (m_InventoryURLs.ContainsKey(userID)) | 220 | if (m_InventoryURLs.ContainsKey(userID)) |
224 | return m_InventoryURLs[userID]; | 221 | return m_InventoryURLs[userID]; |
225 | 222 | ||
226 | else | 223 | CacheInventoryServiceURL(userID); |
227 | CacheInventoryServiceURL(userID); | 224 | |
225 | if (m_InventoryURLs.ContainsKey(userID)) | ||
226 | return m_InventoryURLs[userID]; | ||
228 | 227 | ||
229 | return m_InventoryURLs[userID]; | 228 | return null; //it means that the methods should forward to local grid's inventory |
229 | |||
230 | } | 230 | } |
231 | #endregion | 231 | #endregion |
232 | 232 | ||