summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-06-09 15:47:37 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-06-09 15:47:37 -0700
commitf2f7f7b3bb2c8466e2a07f8f586a1a63fdae8a66 (patch)
tree9c74f8e5ca2601bbdf87a4b5e034b76784bdacea /indra/newview/llviewerregion.cpp
parent163b767944caa4b2a474abf93e64eaeac1f02587 (diff)
parent4bbca7c086724da1af4f8cb6b22e6de8320a0b1b (diff)
merge
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index c48668df9a..da240cedbb 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -216,6 +216,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
mColoName("unknown"),
mProductSKU("unknown"),
mProductName("unknown"),
+ mHttpUrl(""),
mCacheLoaded(FALSE),
mCacheEntriesCount(0),
mCacheID(),
@@ -1555,6 +1556,10 @@ void LLViewerRegion::setCapability(const std::string& name, const std::string& u
else
{
mCapabilities[name] = url;
+ if(name == "GetTexture")
+ {
+ mHttpUrl = url ;
+ }
}
}