Revert "Disable Dullahan 1.21 new features on Linux for now"

This reverts commit 8f11eb47a617d3a1344a39ed37dd1de3b422fb0b.

1 files changed, 0 insertions, 16 deletions

diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp
index a2b664c755..d5ec3dbb20 100644
--- a/indra/media_plugins/cef/media_plugin_cef.cpp
+++ b/indra/media_plugins/cef/media_plugin_cef.cpp
@@ -957,7 +957,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
             {
                 authResponse(message_in);
             }
-#if !LL_LINUX
             if (message_name == "edit_undo")
             {
                 mCEFLib->editUndo();
@@ -966,7 +965,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
             {
                 mCEFLib->editRedo();
             }
-#endif
             if (message_name == "edit_cut")
             {
                 mCEFLib->editCut();
@@ -979,7 +977,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
             {
                 mCEFLib->editPaste();
             }
-#if !LL_LINUX
             if (message_name == "edit_delete")
             {
                 mCEFLib->editDelete();
@@ -992,7 +989,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string)
             {
                 mCEFLib->viewSource();
             }
-#endif
         }
         else if (message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER)
         {
@@ -1176,28 +1172,19 @@ void MediaPluginCEF::unicodeInput(std::string event, LLSD native_key_data = LLSD
 //
 void MediaPluginCEF::checkEditState()
 {
-#if !LL_LINUX
     bool can_undo = mCEFLib->editCanUndo();
     bool can_redo = mCEFLib->editCanRedo();
-#endif
     bool can_cut = mCEFLib->editCanCut();
     bool can_copy = mCEFLib->editCanCopy();
     bool can_paste = mCEFLib->editCanPaste();
-#if !LL_LINUX
     bool can_delete = mCEFLib->editCanDelete();
     bool can_select_all = mCEFLib->editCanSelectAll();
-#endif
 
-#if LL_LINUX
-    if ((can_cut != mCanCut) || (can_copy != mCanCopy) || (can_paste != mCanPaste))
-#else
     if ((can_undo != mCanUndo) || (can_redo != mCanRedo) || (can_cut != mCanCut) || (can_copy != mCanCopy)
         || (can_paste != mCanPaste) || (can_delete != mCanDelete) || (can_select_all != mCanSelectAll))
-#endif
     {
         LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "edit_state");
 
-#if !LL_LINUX
         if (can_undo != mCanUndo)
         {
             mCanUndo = can_undo;
@@ -1209,7 +1196,6 @@ void MediaPluginCEF::checkEditState()
             mCanRedo = can_redo;
             message.setValueBoolean("redo", can_redo);
         }
-#endif
 
         if (can_cut != mCanCut)
         {
@@ -1229,7 +1215,6 @@ void MediaPluginCEF::checkEditState()
             message.setValueBoolean("paste", can_paste);
         }
 
-#if !LL_LINUX
         if (can_delete != mCanDelete)
         {
             mCanDelete = can_delete;
@@ -1241,7 +1226,6 @@ void MediaPluginCEF::checkEditState()
             mCanSelectAll = can_select_all;
             message.setValueBoolean("select_all", can_select_all);
         }
-#endif
 
         sendMessage(message);
     }