diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 816ba6fba..76d96fd2e 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -33,20 +33,26 @@
#include "llpanelgroup.h"
-#include "llagent.h"
+// Library includes
#include "llbutton.h"
+#include "lltabcontainer.h"
+#include "lltextbox.h"
+#include "lluictrlfactory.h"
+#include "llwindow.h"
+
+// Viewer includes
+#include "llviewermessage.h"
+#include "llviewerwindow.h"
+#include "llappviewer.h"
+#include "llnotificationsutil.h"
+
+#include "llagent.h"
+
+#include "llpanelgroupnotices.h"
#include "llpanelgroupgeneral.h"
#include "llpanelgrouproles.h"
#include "llpanelgroupvoting.h"
#include "llpanelgrouplandmoney.h"
-#include "llpanelgroupnotices.h"
-#include "lltabcontainer.h"
-#include "lltextbox.h"
-#include "llviewermessage.h"
-#include "lluictrlfactory.h"
-#include "llviewerwindow.h"
-#include "llappviewer.h"
-#include "llnotificationsutil.h"
// static
void* LLPanelGroupTab::createTab(void* data)
@@ -123,6 +129,11 @@ void LLPanelGroupTab::handleClickHelp()
}
}
+static void copy_group_profile_uri(const LLUUID& id)
+{
+ gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring("secondlife:///app/group/"+id.asString()+"/about"));
+}
+
LLPanelGroup::LLPanelGroup(const LLUUID& group_id)
: LLPanel("PanelGroup", LLRect(), FALSE),
LLGroupMgrObserver( group_id ),
@@ -152,6 +163,7 @@ LLPanelGroup::LLPanelGroup(const LLUUID& group_id)
LLGroupMgr::getInstance()->addObserver(this);
+ mCommitCallbackRegistrar.add("Group.CopyURI", boost::bind(copy_group_profile_uri, group_id));
// Pass on construction of this panel to the control factory.
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_group.xml", &getFactoryMap());
}
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index 73af57ac7..169da75a8 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -244,6 +244,7 @@ BOOL LLPanelGroupGeneral::postBuild()
if (mGroupID.isNull())
{
mGroupNameEditor->setEnabled(TRUE);
+ getChildView("copy_uri")->setVisible(false); // New group has no uri
mEditCharter->setEnabled(TRUE);
mCtrlShowInGroupList->setEnabled(TRUE);
diff --git a/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 17d75c887..dd88bcb5f 100644
--- a/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -40,7 +40,10 @@ Hover your mouse over the options for more help.
border_thickness="1" bottom="-55" enabled="false" follows="left|top"
font="SansSerifSmall" height="16" is_unicode="false" left_delta="65"
max_length="254" mouse_opaque="false" name="group_key"
- width="256" />
+ width="240" />
+
Group Charter
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index 28a1acb3a..72e7eec31 100644
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -15,6 +15,7 @@ Coloca el cursor sobre las opciones para más información.
Escribe aquí el nombre de tu nuevo grupo
+
Creado por