diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 10:30:11 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-20 10:30:11 +0100 |
| commit | 625b15fa7525944ff81e1d7f54b1ed61ee2768ea (patch) | |
| tree | ac69028bb788f92ee50fd699a2c262bbe49b1c91 /indra/newview/llfloaterauction.cpp | |
| parent | 41357bb01297ce0977da7a3e2e9308d3c903d3a8 (diff) | |
| parent | 1ce1e7f9a121cad473c84fced770837da9e6e55c (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llfloaterauction.cpp')
| -rw-r--r-- | indra/newview/llfloaterauction.cpp | 3 |
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; |