summaryrefslogtreecommitdiff
path: root/indra/llimage/llpngwrapper.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
commit25c10ed028da5c547b11f1f461916897272b0e6d (patch)
tree350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/llimage/llpngwrapper.h
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llimage/llpngwrapper.h')
-rw-r--r--indra/llimage/llpngwrapper.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index fd21ae697f..6528fa4480 100644
--- a/indra/llimage/llpngwrapper.h
+++ b/indra/llimage/llpngwrapper.h
@@ -52,7 +52,7 @@ public:
BOOL readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop = NULL);
BOOL writePng(const LLImageRaw* rawImage, U8* dst);
U32 getFinalSize();
- LLString getErrorMessage();
+ const std::string& getErrorMessage();
protected:
void normalizeImage();
@@ -98,7 +98,7 @@ private:
F64 mGamma;
- LLString mErrorMessage;
+ std::string mErrorMessage;
};
#endif