Changes to support dullahan 1.21 undo/redo/delete/select all edit handlers

5 files changed, 110 insertions, 1 deletions

diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 202008f7f9..c7b60b2fd5 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -347,6 +347,7 @@ bool LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
     {
         LLUICtrl::CommitCallbackRegistry::ScopedRegistrar registar;
         registar.add("Open.WebInspector", boost::bind(&LLMediaCtrl::onOpenWebInspector, this));
+        registar.add("Open.ShowSource", boost::bind(&LLMediaCtrl::onShowSource, this));
 
         // stinson 05/05/2014 : use this as the parent of the context menu if the static menu
         // container has yet to be created
@@ -364,8 +365,9 @@ bool LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
     {
         // hide/show debugging options
         bool media_plugin_debugging_enabled = gSavedSettings.getBOOL("MediaPluginDebugging");
+        menu->setItemVisible("debug_separator", media_plugin_debugging_enabled);
         menu->setItemVisible("open_webinspector", media_plugin_debugging_enabled );
-        menu->setItemVisible("debug_separator", media_plugin_debugging_enabled );
+        menu->setItemVisible("show_page_source", media_plugin_debugging_enabled);
 
         menu->show(x, y);
         LLMenuGL::showPopup(this, menu, x, y);
@@ -444,6 +446,12 @@ void LLMediaCtrl::onOpenWebInspector()
         mMediaSource->getMediaPlugin()->showWebInspector( true );
 }
 
+void LLMediaCtrl::onShowSource()
+{
+    if (mMediaSource && mMediaSource->hasMedia())
+        mMediaSource->getMediaPlugin()->showPageSource();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 //
 bool LLMediaCtrl::handleKeyHere( KEY key, MASK mask )
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 9f9564af46..a644ef3071 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -171,6 +171,7 @@ public:
 
         // right click debugging item
         void onOpenWebInspector();
+        void onShowSource();
 
         LLUUID getTextureID() {return mMediaTextureID;}
 
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index c6bc252efd..89861d74bc 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -3511,6 +3511,46 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* plugin, LLPluginCla
 ////////////////////////////////////////////////////////////////////////////////
 // virtual
 void
+LLViewerMediaImpl::undo()
+{
+    if (mMediaSource)
+        mMediaSource->undo();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+bool
+LLViewerMediaImpl::canUndo() const
+{
+    if (mMediaSource)
+        return mMediaSource->canUndo();
+    else
+        return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+void
+LLViewerMediaImpl::redo()
+{
+    if (mMediaSource)
+        mMediaSource->redo();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+bool
+LLViewerMediaImpl::canRedo() const
+{
+    if (mMediaSource)
+        return mMediaSource->canRedo();
+    else
+        return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+void
 LLViewerMediaImpl::cut()
 {
     if (mMediaSource)
@@ -3568,6 +3608,46 @@ LLViewerMediaImpl::canPaste() const
         return false;
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+void
+LLViewerMediaImpl::doDelete()
+{
+    if (mMediaSource)
+        mMediaSource->doDelete();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+bool
+LLViewerMediaImpl::canDoDelete() const
+{
+    if (mMediaSource)
+        return mMediaSource->canDoDelete();
+    else
+        return FALSE;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+void
+LLViewerMediaImpl::selectAll()
+{
+    if (mMediaSource)
+        mMediaSource->selectAll();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+bool
+LLViewerMediaImpl::canSelectAll() const
+{
+    if (mMediaSource)
+        return mMediaSource->canSelectAll();
+    else
+        return FALSE;
+}
+
 void LLViewerMediaImpl::setUpdated(bool updated)
 {
     mIsUpdated = updated ;
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 5753615a43..c17cf59815 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -341,6 +341,12 @@ public:
     /*virtual*/ void handleMediaEvent(LLPluginClassMedia* plugin, LLPluginClassMediaOwner::EMediaEvent);
 
     // LLEditMenuHandler overrides
+    /*virtual*/ void    undo();
+    /*virtual*/ bool    canUndo() const;
+
+    /*virtual*/ void    redo();
+    /*virtual*/ bool    canRedo() const;
+
     /*virtual*/ void    cut();
     /*virtual*/ bool    canCut() const;
 
@@ -350,6 +356,12 @@ public:
     /*virtual*/ void    paste();
     /*virtual*/ bool    canPaste() const;
 
+    /*virtual*/ void    doDelete();
+    /*virtual*/ bool    canDoDelete() const;
+
+    /*virtual*/ void    selectAll();
+    /*virtual*/ bool    canSelectAll() const;
+
     void addObject(LLVOVolume* obj) ;
     void removeObject(LLVOVolume* obj) ;
     const std::list< LLVOVolume* >* getObjectList() const ;
diff --git a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
index f9864637a0..e687ae93e8 100644
--- a/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
+++ b/indra/newview/skins/default/xui/en/menu_media_ctrl.xml
@@ -40,4 +40,12 @@
     <menu_item_call.on_click
      function="Open.WebInspector" />
   </menu_item_call>
+  <menu_item_call
+   label="Show Source"
+   layout="topleft"
+   name="show_page_source"
+   visible="false">
+    <menu_item_call.on_click
+     function="Open.ShowSource" />
+  </menu_item_call>
 </context_menu>