summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-12-20 13:49:20 -0800
committerMerov Linden <merov@lindenlab.com>2013-12-20 13:49:20 -0800
commit7372afaae4aa7097ffad1e9c070b8b9d9a611f62 (patch)
treead7aea7e219ae9e91d504e747e17c06ea284b7c8 /indra/newview
parent6578144b7eda1dae885e5cc172751203b1d16c2d (diff)
ACME-1236 : WIP : Implement colorTransform filter, grayscale and sepia using it, add parameter to llimage_libtest to use filters
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llsnapshotlivepreview.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsnapshotlivepreview.cpp b/indra/newview/llsnapshotlivepreview.cpp
index ab9788a88b..2931178ace 100644
--- a/indra/newview/llsnapshotlivepreview.cpp
+++ b/indra/newview/llsnapshotlivepreview.cpp
@@ -589,7 +589,7 @@ void LLSnapshotLivePreview::generateThumbnailImage(BOOL force_update)
// Merov : Filter also the thumbnail?
if (getFilter() == 1)
{
- raw->colorTransform();
+ raw->filterGrayScale();
}
mThumbnailImage = LLViewerTextureManager::getLocalTexture(raw.get(), FALSE);
mThumbnailUpToDate = TRUE ;
@@ -698,7 +698,7 @@ BOOL LLSnapshotLivePreview::onIdle( void* snapshot_preview )
// Merov : Time to apply the filter to mPreviewImage!!!
if (previewp->getFilter() == 1)
{
- previewp->mPreviewImage->colorTransform();
+ previewp->mPreviewImage->filterGrayScale();
}
// delete any existing image