From ff0fa1290397d96dbf49477a2668fa62e9be22dc Mon Sep 17 00:00:00 2001 From: diva Date: Sat, 7 Feb 2009 16:10:23 +0000 Subject: Adds support for HG linking to specific regions within an instance. The format is Host:Port:Region. Refactored the linking code from MapSearchModule to HGHyperlink, so that it can be used both by the MapSearchModule and the Console command. --- OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/Communications/Hypergrid') diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs index a39161b..2ca956b 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs @@ -329,14 +329,13 @@ namespace OpenSim.Region.Communications.Hypergrid info.RegionSettings.TerrainImageID = ass.Metadata.FullID; ass.Metadata.Type = (int)AssetType.Texture; ass.Metadata.Temporary = false; - //imageData.CopyTo(ass.Data, 0); ass.Data = imageData; m_assetcache.AddAsset(ass); } - catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke + catch // LEGIT: Catching problems caused by OpenJPEG p/invoke { - Console.WriteLine("Failed getting/storing map image: " + e); + Console.WriteLine("[HGrid]: Failed getting/storing map image, because it is probably already in the cache"); } } @@ -463,6 +462,7 @@ namespace OpenSim.Region.Communications.Hypergrid if (hash["region_name"] != null) { info.RegionName = (string)hash["region_name"]; + //Console.WriteLine(">> " + info.RegionName); } if (hash["internal_port"] != null) { -- cgit v1.1