From 715a776f7d62d2af7610dbd3137e3e753fdbc25c Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Tue, 6 Jan 2009 18:06:53 +0000
Subject: * Move common string aggregation for caps seed path to a method in
 CapsUtil

---
 .../Scenes/Hypergrid/HGSceneCommunicationService.cs            | 10 ++++++----
 OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index b793de1..14e0a15 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -210,10 +210,12 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
 
                         if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink)
                         {
-                            // TODO Should construct this behind a method
-                            capsPath =
-                                "http://" + reg.ExternalHostName + ":" + reg.HttpPort
-                                + "/CAPS/" + agentCircuit.CapsPath + "0000/";
+                            capsPath 
+                                = "http://" 
+                                    + reg.ExternalHostName 
+                                    + ":"
+                                    + reg.HttpPort 
+                                    + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
 
                             if (eq != null)
                             {
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 82b9d89..7f56e71 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -801,10 +801,12 @@ namespace OpenSim.Region.Environment.Scenes
 
                         if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY))
                         {
-                            // TODO Should construct this behind a method
-                            capsPath =
-                                "http://" + reg.ExternalHostName + ":" + reg.HttpPort
-                                + "/CAPS/" + agentCircuit.CapsPath + "0000/";
+                            capsPath 
+                                = "http://" 
+                                    + reg.ExternalHostName 
+                                    + ":" 
+                                    + reg.HttpPort 
+                                    + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
 
                             if (eq != null)
                             {
-- 
cgit v1.1