aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorDiva Canto2010-07-04 14:59:15 -0700
committerDiva Canto2010-07-04 14:59:15 -0700
commitb84f72df0b7b3917e917a36546c911cb1953b30b (patch)
tree83655b4b5d17dd10605882fd0258914dc7c1f44f /OpenSim/Region/CoreModules
parentStarted to clean up the mess with HyperAssets in LLClientView. Fixed HG acces... (diff)
downloadopensim-SC_OLD-b84f72df0b7b3917e917a36546c911cb1953b30b.zip
opensim-SC_OLD-b84f72df0b7b3917e917a36546c911cb1953b30b.tar.gz
opensim-SC_OLD-b84f72df0b7b3917e917a36546c911cb1953b30b.tar.bz2
opensim-SC_OLD-b84f72df0b7b3917e917a36546c911cb1953b30b.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')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs7
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs3
3 files changed, 11 insertions, 7 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
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index ebd6bbd..034e692 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -41,7 +41,7 @@ using OpenMetaverse;
41namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset 41namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
42{ 42{
43 public class HGAssetBroker : 43 public class HGAssetBroker :
44 ISharedRegionModule, IAssetService, IHyperAssetService 44 ISharedRegionModule, IAssetService
45 { 45 {
46 private static readonly ILog m_log = 46 private static readonly ILog m_log =
47 LogManager.GetLogger( 47 LogManager.GetLogger(
@@ -150,7 +150,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
150 m_aScene = scene; 150 m_aScene = scene;
151 151
152 scene.RegisterModuleInterface<IAssetService>(this); 152 scene.RegisterModuleInterface<IAssetService>(this);
153 scene.RegisterModuleInterface<IHyperAssetService>(this);
154 } 153 }
155 154
156 public void RemoveRegion(Scene scene) 155 public void RemoveRegion(Scene scene)