aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorDiva Canto2010-07-04 14:59:15 -0700
committerDiva Canto2010-07-04 15:10:52 -0700
commit80e16907bf269db0013d14a2bb123b6bdd27d1bf (patch)
tree1ebcab6c4714fc410484197a1b2a094ef55dc020 /OpenSim/Region/CoreModules/Framework
parentStarted to clean up the mess with HyperAssets in LLClientView. Fixed HG acces... (diff)
downloadopensim-SC_OLD-80e16907bf269db0013d14a2bb123b6bdd27d1bf.zip
opensim-SC_OLD-80e16907bf269db0013d14a2bb123b6bdd27d1bf.tar.gz
opensim-SC_OLD-80e16907bf269db0013d14a2bb123b6bdd27d1bf.tar.bz2
opensim-SC_OLD-80e16907bf269db0013d14a2bb123b6bdd27d1bf.tar.xz
Got rid of all hyperassets references. Also fixed accessing textures in user's inventory in foreign grids.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs7
2 files changed, 10 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 6fdd2a8..cd66af5 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -192,11 +192,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
192 m_assMapper.Post(item.AssetID, receiver, userAssetServer); 192 m_assMapper.Post(item.AssetID, receiver, userAssetServer);
193 } 193 }
194 194
195 195 public override bool IsForeignUser(UUID userID, out string assetServerURL)
196
197 #endregion
198
199 public bool IsForeignUser(UUID userID, out string assetServerURL)
200 { 196 {
201 assetServerURL = string.Empty; 197 assetServerURL = string.Empty;
202 UserAccount account = null; 198 UserAccount account = null;
@@ -220,6 +216,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
220 return false; 216 return false;
221 } 217 }
222 218
219 #endregion
220
223 protected override InventoryItemBase GetItem(UUID agentID, UUID itemID) 221 protected override InventoryItemBase GetItem(UUID agentID, UUID itemID)
224 { 222 {
225 InventoryItemBase item = base.GetItem(agentID, itemID); 223 InventoryItemBase item = base.GetItem(agentID, itemID);
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 39616f7..90b7b51 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -683,6 +683,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
683 return true; 683 return true;
684 } 684 }
685 685
686
687 public virtual bool IsForeignUser(UUID userID, out string assetServerURL)
688 {
689 assetServerURL = string.Empty;
690 return false;
691 }
692
686 #endregion 693 #endregion
687 694
688 #region Misc 695 #region Misc