summaryrefslogtreecommitdiff
path: root/indra/newview/llassetuploadresponders.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2008-05-19 17:02:33 +0000
committerDon Kjer <don@lindenlab.com>2008-05-19 17:02:33 +0000
commit38558960978a0741dd9c79c4c7a108b8a1f99eff (patch)
treeb7221183a7c91c1097a78cf5875197431852b0b8 /indra/newview/llassetuploadresponders.cpp
parente77de5d685ae441f72920f0e04d9887ee958745a (diff)
EFFECTIVE MERGES:
svn merge -r 79616:82632 svn+ssh://svn/svn/linden/branches/maintenance/maintenance-7 into release svn merge -r 83211:87215 svn+ssh://svn/svn/linden/branches/php-framework-3 into release ACTUAL MERGE: svn merge -r 87631:87698 svn+ssh://svn/svn/linden/qa/combo-merge-maintenance-7-php-framework-3 into release dataserver-is-deprecated
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
-rw-r--r--indra/newview/llassetuploadresponders.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index b43c9db40a..3d2ae03d63 100644
--- a/indra/newview/llassetuploadresponders.cpp
+++ b/indra/newview/llassetuploadresponders.cpp
@@ -76,6 +76,7 @@ LLAssetUploadResponder::LLAssetUploadResponder(const LLSD &post_data,
const std::string& file_name)
: LLHTTPClient::Responder(),
mPostData(post_data),
+ mAssetType(LLAssetType::AT_NONE),
mFileName(file_name)
{
}