summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterauction.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-04-20 17:14:00 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-04-20 17:14:00 +0300
commit407cf3bd08b5561cbf2905fb7d8c14320d9bde54 (patch)
tree9b4663f7732e9cae977fce8599bedaeb8e447abe /indra/newview/llfloaterauction.cpp
parent5c78d1f1a999d5a2694e2794aa6712f6d9740ade (diff)
parent5acf8a5f13e064fcfb5d8fbd42e631a18244a674 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterauction.cpp')
-rw-r--r--indra/newview/llfloaterauction.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index 698ccec9c1..679ab4c713 100644
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -46,6 +46,7 @@
#include "llagent.h"
#include "llcombobox.h"
+#include "llmimetypes.h"
#include "llnotifications.h"
#include "llnotificationsutil.h"
#include "llsavedsettingsglue.h"
@@ -351,7 +352,7 @@ void LLFloaterAuction::doResetParcel()
body["music_url"] = empty;
body["media_url"] = empty;
body["media_desc"] = empty;
- body["media_type"] = std::string("none/none");
+ body["media_type"] = LLMIMETypes::getDefaultMimeType();
body["media_width"] = (S32) 0;
body["media_height"] = (S32) 0;
body["auto_scale"] = (S32) 0;