diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-02-22 12:01:51 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-02-22 12:01:51 -0800 |
| commit | b785e99cff3ac1df2d057188162d2feee5e92ace (patch) | |
| tree | d7345dd2ad4facbb630a4580aa9db7bf0e2d353d | |
| parent | bfabb7bd2b02654e00f5b8d12541e9bec9cbbad7 (diff) | |
Killing windows line endings.
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 1bb97f3291..8d9d1dd975 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -312,13 +312,13 @@ void MediaPluginCEF::onFileDownloadCallback(const std::string filename) // const std::string MediaPluginCEF::onFileDialogCallback() { - mPickedFile.clear();
-
- LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "pick_file");
- message.setValueBoolean("blocking_request", true);
-
- sendMessage(message);
-
+ mPickedFile.clear(); + + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "pick_file"); + message.setValueBoolean("blocking_request", true); + + sendMessage(message); + return mPickedFile; } @@ -666,9 +666,9 @@ void MediaPluginCEF::receiveMessage(const char* message_string) { mEnableMediaPluginDebugging = message_in.getValueBoolean("enable"); } - if (message_name == "pick_file_response")
- {
- mPickedFile = message_in.getValue("file");
+ if (message_name == "pick_file_response") + { + mPickedFile = message_in.getValue("file"); } if (message_name == "auth_response") { |