Merge remote-tracking branch 'mccabe/exp' into weekly

Conflicts:  (Keeping these around as a record, there was some strangeness.
	.gitignore
	linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
	linden/indra/newview/llfloaterregioninfo.cpp
	linden/indra/newview/llfloatertos.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/skins/default/html/en-us/loading-error/index.html
	linden/indra/newview/skins/default/html/en-us/loading/loading.html
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/install.xml

1 files changed, 20 insertions, 0 deletions

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index f7163ee..a5d2c98 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -57,6 +57,7 @@
 #include "lltrans.h"
 #include "llappviewer.h" 
 #include "llglheaders.h"
+#include "llviewerwindow.h"
 #include "llwindow.h"
 #include "viewerversion.h"
 
@@ -106,6 +107,8 @@ LLFloaterAbout::LLFloaterAbout()
                 return;
         }
 
+        childSetAction("copy_btn", onClickCopy, this);
+
         // For some reason, adding style doesn't work unless this is true.
         support_widget->setParseHTML(TRUE);
 
@@ -294,6 +297,23 @@ void LLFloaterAbout::show(void*)
         sInstance->open();       /*Flawfinder: ignore*/
 }
 
+// static
+void LLFloaterAbout::onClickCopy(void* user_data)
+{
+        LLFloaterAbout* self = (LLFloaterAbout*)user_data;
+
+        if (self)
+        {
+                LLViewerTextEditor* support_widget = self->getChild<LLViewerTextEditor>("support_editor", true);
+
+                if (support_widget)
+                {
+                        std::string buffer = support_widget->getText();
+                        gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
+                }
+        }
+}
+
 
 static std::string get_viewer_release_notes_url()
 {