diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-05 10:49:17 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-05 10:49:17 +0100 |
| commit | e23643c46b8f80180b1ac901b930c18e5df9171d (patch) | |
| tree | da49c1923cf409e9b16a3021f3c8762fe91c0e53 /indra/newview/llviewerregion.cpp | |
| parent | 2d70b8f05286251f25f33a33c507c0a9c0d4e370 (diff) | |
| parent | 033f0dbdef5d23858065dcdcc2f70e5546f50651 (diff) | |
merge from 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 ; + } } } |