diff options
author | callum_linden <none@none> | 2016-01-21 16:20:51 -0800 |
---|---|---|
committer | callum_linden <none@none> | 2016-01-21 16:20:51 -0800 |
commit | c41b94cd5ea43b5d3e2cc93bb76972c5ea147739 (patch) | |
tree | d5379a98c681c67b40472a384d50ad449ea68031 /indra | |
parent | 0f265ebf724b3c781afc234875171ed90f45d4e9 (diff) |
Fix @#$@#$$@# windows line endings introduced via Sublime Text copy/paste
Diffstat (limited to 'indra')
-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") { |