diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-06-04 22:38:22 -0600 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-06-04 22:38:22 -0600 |
| commit | eec00a712fff079009ae793d86e27b7f3ab13053 (patch) | |
| tree | e320d22382272e4a3ef59402ca4607484c9dd2dd /indra/newview/llviewerregion.cpp | |
| parent | 747435b3423b7e482b8fc6abdffe624ff70f4c74 (diff) | |
| parent | 4c0624b04e73f53040179d3688b0234ca84830cb (diff) | |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 5 |
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 ; + } } } |