diff options
| author | opensim mirror account | 2010-10-22 16:00:06 -0700 |
|---|---|---|
| committer | opensim mirror account | 2010-10-22 16:00:06 -0700 |
| commit | bf5cc32b5f87de786ea764021571b2bdcf1e64cd (patch) | |
| tree | 86f05bdff474bc42ee90a7e1d3dcfc508ab2bc04 /OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.zip opensim-SC-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.gz opensim-SC-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.bz2 opensim-SC-bf5cc32b5f87de786ea764021571b2bdcf1e64cd.tar.xz | |
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs | 4 |
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); |