diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 597a60fd1..43f8b7e95 100644 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -87,6 +87,16 @@ LLFloaterAbout* LLFloaterAbout::sInstance = NULL; static std::string get_viewer_release_notes_url(); +static void onAboutClickCopyToClipboard(void* user_data) +{ + LLFloater* self = (LLFloater*) user_data; + LLViewerTextEditor *support_widget = + self->getChild("support_editor", true); + support_widget->selectAll(); + support_widget->copy(); + support_widget->deselect(); +} + ///---------------------------------------------------------------------------- /// Class LLFloaterAbout ///---------------------------------------------------------------------------- @@ -107,7 +117,8 @@ LLFloaterAbout::LLFloaterAbout() LLViewerTextEditor *credits_widget = getChild("credits_editor", true); - + + childSetAction("copy_btn", onAboutClickCopyToClipboard, this); if (!support_widget || !credits_widget) { @@ -264,7 +275,7 @@ LLFloaterAbout::LLFloaterAbout() // TODO: Implement media plugin version query - support.append("Qt Webkit Version: 4.5.2 "); + support.append("Qt Webkit Version: 4.6.0 "); support.append("\n"); if (gPacketsIn > 0) @@ -315,7 +326,8 @@ void LLFloaterAbout::show(void*) static std::string get_viewer_release_notes_url() { - std::ostringstream version; + return "http://www.singularityviewer.org"; + /*std::ostringstream version; version << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH @@ -329,5 +341,6 @@ static std::string get_viewer_release_notes_url() std::ostringstream url; url << RELEASE_NOTES_BASE_URL << LLURI::mapToQueryString(query); - return "http://ascent.balseraph.org/index.php/Ascent_" + version.str();// url.str(); + return "http://ascent.balseraph.org/index.php/Ascent_" + version.str();// url.str();*/ } + diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml index 1090f3607..3aa908d14 100644 --- a/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -3,11 +3,62 @@ can_resize="false" height="440" min_height="100" min_width="100" name="floater_about" rect_control="FloaterAboutRect" title="About Singularity Viewer" width="470"> - -Singularity Viewer is developed and maintained by Siana Gearz with contributions by Shyotl Kuhr. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based off the Inertia source base. + + + +