aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/InterGrid
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-10-22 23:34:44 +0100
committerJustin Clark-Casey (justincc)2010-10-22 23:34:44 +0100
commita490b34b6e584119312bd1b9ee8c30c4b9f02c62 (patch)
treedb3125aa52414dc0cf9a441027034667bc5e9635 /OpenSim/Region/CoreModules/InterGrid
parentRevert "* remove some spurious debug info" (diff)
downloadopensim-SC_OLD-a490b34b6e584119312bd1b9ee8c30c4b9f02c62.zip
opensim-SC_OLD-a490b34b6e584119312bd1b9ee8c30c4b9f02c62.tar.gz
opensim-SC_OLD-a490b34b6e584119312bd1b9ee8c30c4b9f02c62.tar.bz2
opensim-SC_OLD-a490b34b6e584119312bd1b9ee8c30c4b9f02c62.tar.xz
Revert "* more url / hg cleanup"
This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d.
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid')
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 2dd7767..fd0e879 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -595,12 +595,12 @@ namespace OpenSim.Region.CoreModules.InterGrid
595 // DEPRECATED 595 // DEPRECATED
596 responseMap["seed_capability"] 596 responseMap["seed_capability"]
597 = OSD.FromString( 597 = OSD.FromString(
598 regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/" + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath)); 598 regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
599 599
600 // REPLACEMENT 600 // REPLACEMENT
601 responseMap["region_seed_capability"] 601 responseMap["region_seed_capability"]
602 = OSD.FromString( 602 = OSD.FromString(
603 regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + "/" + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath)); 603 regionCapsHttpProtocol + httpaddr + ":" + reg.HttpPort + CapsUtil.GetCapsSeedPath(userCap.CapsObjectPath));
604 604
605 responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); 605 responseMap["rez_avatar"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);
606 responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath); 606 responseMap["rez_avatar/rez"] = OSD.FromString(rezHttpProtocol + httpaddr + ":" + urlport + rezAvatarPath);