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/llmimetypes.h | |
| parent | 41357bb01297ce0977da7a3e2e9308d3c903d3a8 (diff) | |
| parent | 1ce1e7f9a121cad473c84fced770837da9e6e55c (diff) | |
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llmimetypes.h')
| -rw-r--r-- | indra/newview/llmimetypes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llmimetypes.h b/indra/newview/llmimetypes.h index b217ce7a81..3461769ff3 100644 --- a/indra/newview/llmimetypes.h +++ b/indra/newview/llmimetypes.h @@ -66,6 +66,10 @@ public: static std::string findDefaultMimeType(const std::string& widget_type); // Canonical mime type associated with this widget set + static const std::string& getDefaultMimeType(); + + static const std::string& getDefaultMimeTypeTranslation(); + static bool findAllowResize(const std::string& mime_type); // accessor for flag to enable/disable media size edit fields |