aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authordiva2009-05-22 04:23:59 +0000
committerdiva2009-05-22 04:23:59 +0000
commitda170cde4684ea0f8ed90ea4ed0b30172ad9981d (patch)
tree0ffc809b31853d81479fee0c4e053025d31adb9d /OpenSim/Region/Framework/Scenes
parentRemoving the [UserService] section, because it's not working yet. (diff)
downloadopensim-SC-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.zip
opensim-SC-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.gz
opensim-SC-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.bz2
opensim-SC-da170cde4684ea0f8ed90ea4ed0b30172ad9981d.tar.xz
Cleaning up a few HG things. HG Posts may now work in grids, but if the home grid is a standalone, this still doesn't work -- something wrong with RegionAssetService's DB connection.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs11
1 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 1750bbf..720a09b 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -46,12 +46,6 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
46 #region Fields 46 #region Fields
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 // This maps between asset server URLs and asset server clients
50 private Dictionary<string, GridAssetClient> m_assetServers = new Dictionary<string, GridAssetClient>();
51
52 // This maps between asset UUIDs and asset servers
53 private Dictionary<UUID, GridAssetClient> m_assetMap = new Dictionary<UUID, GridAssetClient>();
54
55 // This maps between inventory server urls and inventory server clients 49 // This maps between inventory server urls and inventory server clients
56 private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>(); 50 private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>();
57 51
@@ -103,11 +97,6 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
103 return false; 97 return false;
104 } 98 }
105 99
106 private bool IsInAssetMap(UUID uuid)
107 {
108 return m_assetMap.ContainsKey(uuid);
109 }
110
111 private AssetBase FetchAsset(string url, UUID assetID, bool isTexture) 100 private AssetBase FetchAsset(string url, UUID assetID, bool isTexture)
112 { 101 {
113 AssetBase asset = m_scene.AssetService.Get(url + "/" + assetID.ToString()); 102 AssetBase asset = m_scene.AssetService.Get(url + "/" + assetID.ToString());