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/Modules/InterGrid | |
| parent | * Yeah, might just want to add the new class as well - sigh (diff) | |
| download | opensim-SC-715a776f7d62d2af7610dbd3137e3e753fdbc25c.zip opensim-SC-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.gz opensim-SC-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.bz2 opensim-SC-715a776f7d62d2af7610dbd3137e3e753fdbc25c.tar.xz | |
* Move common string aggregation for caps seed path to a method in CapsUtil
Diffstat (limited to 'OpenSim/Region/Environment/Modules/InterGrid')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index 75755cb..a03bae3 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | |||
| @@ -576,10 +576,14 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
| 576 | } | 576 | } |
| 577 | 577 | ||
| 578 | // DEPRECIATED | 578 | // DEPRECIATED |
| 579 | responseMap["seed_capability"] = OSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); | 579 | responseMap["seed_capability"] |
| 580 | = OSD.FromString( | ||
| 581 | regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath)); | ||
| 580 | 582 | ||
| 581 | // REPLACEMENT | 583 | // REPLACEMENT |
| 582 | responseMap["region_seed_capability"] = OSD.FromString(regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/CAPS/" + userCap.CapsObjectPath + "0000/"); | 584 | responseMap["region_seed_capability"] |
| 585 | = OSD.FromString( | ||
| 586 | regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath)); | ||
| 583 | 587 | ||
| 584 | responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); | 588 | responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); |
| 585 | responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); | 589 | responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); |