diff options
| author | Justin Clarke Casey | 2009-01-06 18:06:53 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2009-01-06 18:06:53 +0000 |
| commit | 715a776f7d62d2af7610dbd3137e3e753fdbc25c (patch) | |
| tree | 0800abc6a4c7f875c47af19586c79b3aedd79e4c /OpenSim/Region/Environment/Scenes | |
| parent | * Yeah, might just want to add the new class as well - sigh (diff) | |
| download | opensim-SC_OLD-715a776f7d62d2af7610dbd3137e3e753fdbc25c.zip opensim-SC_OLD-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.gz opensim-SC_OLD-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.bz2 opensim-SC_OLD-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.xz | |
* Move common string aggregation for caps seed path to a method in CapsUtil
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs | 10 | ||||
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs | 10 |
2 files changed, 12 insertions, 8 deletions
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 | |||
| 210 | 210 | ||
| 211 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) | 211 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY) || isHyperLink) |
| 212 | { | 212 | { |
| 213 | // TODO Should construct this behind a method | 213 | capsPath |
| 214 | capsPath = | 214 | = "http://" |
| 215 | "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 215 | + reg.ExternalHostName |
| 216 | + "/CAPS/" + agentCircuit.CapsPath + "0000/"; | 216 | + ":" |
| 217 | + reg.HttpPort | ||
| 218 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
| 217 | 219 | ||
| 218 | if (eq != null) | 220 | if (eq != null) |
| 219 | { | 221 | { |
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 | |||
| 801 | 801 | ||
| 802 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 802 | if (Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY)) |
| 803 | { | 803 | { |
| 804 | // TODO Should construct this behind a method | 804 | capsPath |
| 805 | capsPath = | 805 | = "http://" |
| 806 | "http://" + reg.ExternalHostName + ":" + reg.HttpPort | 806 | + reg.ExternalHostName |
| 807 | + "/CAPS/" + agentCircuit.CapsPath + "0000/"; | 807 | + ":" |
| 808 | + reg.HttpPort | ||
| 809 | + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath); | ||
| 808 | 810 | ||
| 809 | if (eq != null) | 811 | if (eq != null) |
| 810 | { | 812 | { |