From 13678ca85fe32652133a997dd5969b9901f8ef10 Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Sat, 7 Aug 2010 23:35:15 +0000
Subject: [PATCH] store encryption type along with the decrypted comment

---
 indra/newview/llviewerimage.cpp | 6 +++++-
 indra/newview/llviewerimage.h   | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewerimage.cpp b/indra/newview/llviewerimage.cpp
index cb825a5fe..ef8d80176 100644
--- a/indra/newview/llviewerimage.cpp
+++ b/indra/newview/llviewerimage.cpp
@@ -142,7 +142,11 @@ virtual void completed(bool success)
 	{
 
 		//llinfos << "SUCCESS getting texture "<<mID<< llendl;
-		mViewerImage->decodedComment = LLImageMetaDataReader::ExtractEncodedComment(mFormattedImage->getData(),mFormattedImage->getDataSize());
+		mViewerImage->commentEncryptionType = LLImageMetaDataReader::ExtractEncodedComment(
+				mFormattedImage->getData(),
+				mFormattedImage->getDataSize(),
+				mViewerImage->decodedComment
+		);
 		
 	}
 	else
diff --git a/indra/newview/llviewerimage.h b/indra/newview/llviewerimage.h
index 9af7f471a..5230859fd 100644
--- a/indra/newview/llviewerimage.h
+++ b/indra/newview/llviewerimage.h
@@ -366,6 +366,7 @@ public:
 	LLFrameTimer mLastReferencedTimer;
 
 	std::string decodedComment;
+	unsigned int commentEncryptionType;
 
 private:
 	LLUUID mID;