diff options
author | diva | 2009-02-07 16:10:23 +0000 |
---|---|---|
committer | diva | 2009-02-07 16:10:23 +0000 |
commit | ff0fa1290397d96dbf49477a2668fa62e9be22dc (patch) | |
tree | e7be5308f5379f5a6d2c0f663ebe0b8aa6bf87f4 /OpenSim/Region/Communications | |
parent | Fix a .NET issue where changing a locked reference would cause a crash (diff) | |
download | opensim-SC-ff0fa1290397d96dbf49477a2668fa62e9be22dc.zip opensim-SC-ff0fa1290397d96dbf49477a2668fa62e9be22dc.tar.gz opensim-SC-ff0fa1290397d96dbf49477a2668fa62e9be22dc.tar.bz2 opensim-SC-ff0fa1290397d96dbf49477a2668fa62e9be22dc.tar.xz |
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.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGGridServices.cs | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
329 | info.RegionSettings.TerrainImageID = ass.Metadata.FullID; | 329 | info.RegionSettings.TerrainImageID = ass.Metadata.FullID; |
330 | ass.Metadata.Type = (int)AssetType.Texture; | 330 | ass.Metadata.Type = (int)AssetType.Texture; |
331 | ass.Metadata.Temporary = false; | 331 | ass.Metadata.Temporary = false; |
332 | //imageData.CopyTo(ass.Data, 0); | ||
333 | ass.Data = imageData; | 332 | ass.Data = imageData; |
334 | m_assetcache.AddAsset(ass); | 333 | m_assetcache.AddAsset(ass); |
335 | 334 | ||
336 | } | 335 | } |
337 | catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke | 336 | catch // LEGIT: Catching problems caused by OpenJPEG p/invoke |
338 | { | 337 | { |
339 | Console.WriteLine("Failed getting/storing map image: " + e); | 338 | Console.WriteLine("[HGrid]: Failed getting/storing map image, because it is probably already in the cache"); |
340 | } | 339 | } |
341 | } | 340 | } |
342 | 341 | ||
@@ -463,6 +462,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
463 | if (hash["region_name"] != null) | 462 | if (hash["region_name"] != null) |
464 | { | 463 | { |
465 | info.RegionName = (string)hash["region_name"]; | 464 | info.RegionName = (string)hash["region_name"]; |
465 | //Console.WriteLine(">> " + info.RegionName); | ||
466 | } | 466 | } |
467 | if (hash["internal_port"] != null) | 467 | if (hash["internal_port"] != null) |
468 | { | 468 | { |