diff options
author | Xiaohong Bao <bao@lindenlab.com> | 2009-11-06 06:52:24 +0000 |
---|---|---|
committer | Xiaohong Bao <bao@lindenlab.com> | 2009-11-06 06:52:24 +0000 |
commit | 35e200881c38eb6c1bfd1f14ef440d4bc4da8c74 (patch) | |
tree | 8fceb759ef8f8259fd574c398ac02965566a05ff /indra/newview/llfloaterreporter.cpp | |
parent | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (diff) |
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
Diffstat (limited to 'indra/newview/llfloaterreporter.cpp')
-rw-r--r-- | indra/newview/llfloaterreporter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index b146ed9b38..8e5a76bfae 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -790,7 +790,7 @@ void LLFloaterReporter::takeScreenshot() // store in the image list so it doesn't try to fetch from the server LLPointer<LLViewerFetchedTexture> image_in_list = LLViewerTextureManager::getFetchedTexture(mResourceDatap->mAssetInfo.mUuid, TRUE, FALSE, LLViewerTexture::FETCHED_TEXTURE); - image_in_list->createGLTexture(0, raw); + image_in_list->createGLTexture(0, raw, 0, TRUE, LLViewerTexture::OTHER); // the texture picker then uses that texture LLTexturePicker* texture = getChild<LLTextureCtrl>("screenshot"); |