diff options
| author | Melanie | 2010-10-21 07:33:01 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-21 07:33:01 +0100 |
| commit | fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e (patch) | |
| tree | ffe3d70e95b159dc4c7b3bf9613bca865d4067d3 /OpenSim/Region/CoreModules/InterGrid | |
| parent | COmmented the wrong line instead, now I commented them all to be on the safe ... (diff) | |
| parent | Skip empty strings in ParseString* functions (diff) | |
| download | opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.zip opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.gz opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.bz2 opensim-SC-fc33d569cd760b0ecf2d487b8d91d4ac3c53d08e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/InterGrid')
| -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 fd0e879..2dd7767 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); |