diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-06-07 11:27:42 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-06-07 11:27:42 -0700 |
| commit | 085b2c24f9ded3d0e9a33500a287aaa53e8b7fba (patch) | |
| tree | 0f2ad3881231003f14c3bd9a96d2f284114facbd /indra/newview/llviewerregion.cpp | |
| parent | 4db92e5155f604492cbc8f5053bcd24237e3c3b6 (diff) | |
| parent | ea5d8a1634a0457e57251b7a7ce76631cfd3f745 (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 ; + } } } |