summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerregion.cpp15
1 files changed, 14 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 6737b113af..be7fb04206 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1552,7 +1552,20 @@ std::string LLViewerRegion::getCapability(const std::string& name) const
{
return "";
}
- return iter->second;
+
+ std::string http_url = iter->second;
+
+ std::string ip_string = mHost.getIPString();
+ std::string host_string = mHost.getHostName();
+
+ std::string::size_type idx = http_url.find(host_string);
+
+ if (!ip_string.empty() && !host_string.empty() && idx != std::string::npos)
+ {
+ http_url.replace(idx, host_string.length(), ip_string);
+ }
+
+ return http_url;
}
void LLViewerRegion::logActiveCapabilities() const