summaryrefslogtreecommitdiff
path: root/indra/llimage
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2007-10-10 00:01:43 +0000
committerChristian Goetze <cg@lindenlab.com>2007-10-10 00:01:43 +0000
commit5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch)
tree12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/llimage
parentb3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff)
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llimage')
-rw-r--r--indra/llimage/llimage.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index ae5f5eb55f..65a7c54a50 100644
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -114,7 +114,7 @@ protected:
public:
static const LLString& getLastError() {return sLastErrorMessage;};
static void resetLastError() {sLastErrorMessage = LLString("No Error"); };
- static BOOL setLastError(const LLString& message, const LLString& filename = ""); // returns FALSE
+ static BOOL setLastError(const LLString& message, const LLString& filename = LLString()); // returns FALSE
static void generateMip(const U8 *indata, U8* mipdata, int width, int height, S32 nchannels);