summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-02 17:06:08 -0600
committerDave Parks <davep@lindenlab.com>2010-03-02 17:06:08 -0600
commit5f9591535138d782f0f9666b39534149de0562a1 (patch)
tree6790076712a5ef1000f835cd6bc97b5e14d87ea3 /indra/newview/llviewerregion.cpp
parente38adc5baf0bf4090168088fc4b9a71a5b231aa4 (diff)
Can upload textures from model preview now.
Fix for bad region crossing.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index be7fb04206..dc1dfeb82b 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1553,19 +1553,7 @@ std::string LLViewerRegion::getCapability(const std::string& name) const
return "";
}
- 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;
+ return iter->second;
}
void LLViewerRegion::logActiveCapabilities() const