diff --git a/autobuild.xml b/autobuild.xml
index 0e36cae3a3d168361a022cdb7c944193d5951a79..a715e1a3807de4b69cce3436b38266d3988e65bc 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -476,11 +476,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>3a2e26f01656a6634023d83f2a53a36a373c61b6af1d00517543050a09826113a2f99121ece20c2c0b581aab9020aeb7cdfe972fa331ea94f3862556a70eae19</string>
+ <string>decc2db6e9f4188567f5c9c45d7043a52a34ca3150e35c5fd6573c522f7d95d23bb63480986d5f56847e5fa275621aafe5d2903bd1e37a8dd0a9c3a47ed11a89</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan/1.12.4_118.4.1_g3dd6078_chromium-118.0.5993.54.2178/dullahan-1.12.4_118.4.1_g3dd6078_chromium-118.0.5993.54-darwin64-2178.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan/1.14.0_121.0.1_g7a4b55f_chromium-121.0.6167.16.2285/dullahan-1.14.0_121.0.1_g7a4b55f_chromium-121.0.6167.16-darwin64-2285.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -490,11 +490,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ab9d290a61fb038e6c0ba9ce4efa5f431238e1ab9d4de2c28da1ad0114926af9b716db90cb216816ec8a1de3680d358913851e316d8df6b5eea5302989d9f3bc</string>
+ <string>e61dbbe0280cf578f217c6fee6f9ad6bdb13e8b325e86b733cd3250bf787f39d20079caa55031c3c1184db87048e490cedfcd1fdc0a28fde422ed60696b257e0</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan/1.12.4_118.4.1_g3dd6078_chromium-118.0.5993.54.2178/dullahan-1.12.4_118.4.1_g3dd6078_chromium-118.0.5993.54-linux64-2178.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan/1.14.0_121.0.1_g7a4b55f_chromium-121.0.6167.16.2285/dullahan-1.14.0_121.0.1_g7a4b55f_chromium-121.0.6167.16-linux64-2285.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -504,11 +504,11 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>e88cd99c9d71b2dd1297007bcfdac224d5401cdfadd7aeb069195392274559f7f63ee312061d3441ba7505a4e649ccea67f9d8f3f3c56c9cce638b35c29b6eb5</string>
+ <string>26318a6d7628feb176ed7a5bad66d8a6a6d3c69e319bcac515c56194a573a10c0638b193bcfa63d296f876421d82d40b44075a2362d42166e37fa9c5bd348cee</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan/1.12.4_118.4.1_g3dd6078_chromium-118.0.5993.54.2178/dullahan-1.12.4_118.4.1_g3dd6078_chromium-118.0.5993.54-windows64-2178.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/103/packages/generic/dullahan/1.14.0_121.0.1_g7a4b55f_chromium-121.0.6167.16.2285/dullahan-1.14.0_121.0.1_g7a4b55f_chromium-121.0.6167.16-windows64-2285.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -521,7 +521,7 @@
<key>copyright</key>
<string>Copyright (c) 2017, Linden Research, Inc.</string>
<key>version</key>
- <string>1.12.4_118.4.1_g3dd6078_chromium-118.0.5993.54</string>
+ <string>1.14.0_121.0.1_g7a4b55f_chromium-121.0.6167.16</string>
<key>name</key>
<string>dullahan</string>
<key>description</key>
@@ -598,11 +598,11 @@
<key>creds</key>
<string>gitlab</string>
<key>hash</key>
- <string>fa5d856b9608b15d9ec89bb1869c382e92235cc4099475acf7a54b7a759493cf188098e77997d4de845f55d4f9bdaba2443d3030646acb10f690bfc895a9ba49</string>
+ <string>8d4f9a01214ddcc414ce2501e1462bccb8f04e15b4274376bec23b26e4441fe74e59cde026ca59c00aef2efc5cfed49fcf87965e16a2d7184ed33da667642584</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio/2.02.19.2199/fmodstudio-2.02.19-darwin64-2199.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio/2.02.20.2284/fmodstudio-2.02.20-darwin64-2284.tar.zst</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -614,11 +614,11 @@
<key>creds</key>
<string>gitlab</string>
<key>hash</key>
- <string>9e75cd818a2d476222c9d0445fe57ff1036cfd0d860c29e22c5f69aaf529adf0afccdeea271f8bd0fa4df8ec8a0c46f5a683e762418b6bc571453908f7c7315f</string>
+ <string>4058c0124712270c2874250a829124813408b49d07c3202c225c677088d01af59a5899ad7575cd932b1cfd39e2768fc9d1f43a9a2cbb83c63ad9478ef978535e</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio/2.02.19.2199/fmodstudio-2.02.19-linux64-2199.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio/2.02.20.2284/fmodstudio-2.02.20-linux64-2284.tar.zst</string>
</map>
<key>name</key>
<string>linux64</string>
@@ -630,11 +630,11 @@
<key>creds</key>
<string>gitlab</string>
<key>hash</key>
- <string>863ce55621614cb05bc8c1dc0ea313553c6dcb85c8ae9aee67dd04cb3910e78412e7fbefc18ed1281fa726af87d7b7a2b87023784405049fbd27a7dbd8909880</string>
+ <string>89365c56c2c83f4d83aad236c304ba321529ddc4c4124f3abb43965104f85fc1c470b2e53dc24c86c5c62b65923b5f1dc1aff803489b6f19393227b374c861ae</string>
<key>hash_algorithm</key>
<string>blake2b</string>
<key>url</key>
- <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio/2.02.19.2199/fmodstudio-2.02.19-windows64-2199.tar.zst</string>
+ <string>https://git.alchemyviewer.org/api/v4/projects/49/packages/generic/fmodstudio/2.02.20.2284/fmodstudio-2.02.20-windows64-2284.tar.zst</string>
</map>
<key>name</key>
<string>windows64</string>
@@ -647,7 +647,7 @@
<key>copyright</key>
<string>FMOD Studio, Copyright (c) Firelight Technologies Pty Ltd.</string>
<key>version</key>
- <string>2.02.19</string>
+ <string>2.02.20</string>
<key>name</key>
<string>fmodstudio</string>
<key>description</key>
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp
index ffbd7518fa0b892b22d538c08ef886ccd811aecf..12bf6faab39ab3a2c9100ee9e64a8152e1d55733 100644
--- a/indra/newview/lldrawpoolwater.cpp
+++ b/indra/newview/lldrawpoolwater.cpp
@@ -119,7 +119,6 @@ void LLDrawPoolWater::beginPostDeferredPass(S32 pass)
LLRenderTarget& depth_src = gPipeline.mRT->deferredScreen;
LLRenderTarget& dst = gPipeline.mWaterDis;
- src.flush();
dst.bindTarget();
gCopyDepthProgram.bind();
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 26e6a69e6b6e16c8bb7194c3fc625b34561f062a..5d9d9efd613f01cfad3a266629be1c314874f15c 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -29,6 +29,7 @@
// Library includes
#include "llbutton.h"
+#include "llclipboard.h"
#include "llfloatersidepanelcontainer.h"
#include "lltabcontainer.h"
#include "lltextbox.h"
@@ -43,6 +44,7 @@
#include "llfloater.h"
#include "llgroupactions.h"
#include "llfloatergroupprofile.h"
+#include "llslurl.h"
#include "llagent.h"
@@ -93,6 +95,7 @@ LLPanelGroup::LLPanelGroup()
// Set up the factory callbacks.
// Roles sub tabs
LLGroupMgr::getInstance()->addObserver(this);
+ mCommitCallbackRegistrar.add("Profile.Commit", [this](LLUICtrl*, const LLSD& userdata) { onCommitMenu(userdata); });
}
@@ -378,6 +381,8 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
group_name_ctrl->setToolTip(group_name);
}
+ getChild<LLUICtrl>("group_key")->setValue(str_group_id);
+
bool is_null_group_id = group_id.isNull();
if(mButtonApply)
mButtonApply->setVisible(!is_null_group_id);
@@ -426,6 +431,9 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
tab_experiences->setVisible(false);
getChild<LLUICtrl>("group_name")->setVisible(false);
+ getChild<LLUICtrl>("Key:")->setVisible(false);
+ getChild<LLUICtrl>("group_key")->setVisible(false);
+ getChild<LLUICtrl>("clipboard_group")->setVisible(false);
getChild<LLUICtrl>("group_name_editor")->setVisible(true);
if(mButtonCall)
@@ -458,6 +466,9 @@ void LLPanelGroup::setGroupID(const LLUUID& group_id)
tab_experiences->setVisible(is_member);
getChild<LLUICtrl>("group_name")->setVisible(true);
+ getChild<LLUICtrl>("Key:")->setVisible(true);
+ getChild<LLUICtrl>("group_key")->setVisible(true);
+ getChild<LLUICtrl>("clipboard_group")->setVisible(true);
getChild<LLUICtrl>("group_name_editor")->setVisible(false);
if(mButtonApply)
@@ -627,4 +638,26 @@ void LLPanelGroup::showNotice(const std::string& subject,
}
-
+void LLPanelGroup::onCommitMenu(const LLSD& userdata)
+{
+ const std::string item_name = userdata.asString();
+ if (item_name == "copy_group_slurl")
+ {
+ LLWString wstr = utf8str_to_wstring(LLSLURL("group", mID, "about").getSLURLString());
+ LLClipboard::instance().copyToClipboard(wstr, 0, wstr.size());
+ }
+ else if (item_name == "copy_group_id")
+ {
+ LLWString wstr = utf8str_to_wstring(mID.asString());
+ LLClipboard::instance().copyToClipboard(wstr, 0, wstr.size());
+ }
+ else if (item_name == "copy_group_name")
+ {
+ std::string name;
+ if (gCacheName->getGroupName(mID, name))
+ {
+ LLWString wstr = utf8str_to_wstring(name);
+ LLClipboard::instance().copyToClipboard(wstr, 0, wstr.size());
+ }
+ }
+}
diff --git a/indra/newview/llpanelgroup.h b/indra/newview/llpanelgroup.h
index 4a8a084d340ac785f53a16f363553fc15771c426..1a97d5f2ccbc441c6fdb884f8db81f2d0923d781 100644
--- a/indra/newview/llpanelgroup.h
+++ b/indra/newview/llpanelgroup.h
@@ -102,6 +102,7 @@ class LLPanelGroup : public LLPanel,
void reposButton(LLButton* button);
void reposButtons();
+ void onCommitMenu(const LLSD& userdata);
protected:
bool apply(LLPanelGroupTab* tab);
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 6aeb807156bdaafdff3ad0225ff0d930eedc6762..b0bb720279efef917379c493baf21cb972014dc8 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1993,6 +1993,13 @@ BOOL LLPanelObjectInventory::handleKeyHere( KEY key, MASK mask )
BOOL handled = FALSE;
switch (key)
{
+ case KEY_RETURN:
+ if (mask == MASK_NONE)
+ {
+ LLPanelObjectInventory::doToSelected(LLSD("task_open"));
+ handled = TRUE;
+ }
+ break;
case KEY_DELETE:
#if LL_DARWIN
case KEY_BACKSPACE:
diff --git a/indra/newview/skins/default/xui/en/menu_copy_paste_group_profile.xml b/indra/newview/skins/default/xui/en/menu_copy_paste_group_profile.xml
new file mode 100644
index 0000000000000000000000000000000000000000..703d6a8b2680db61d2511cb7cdb2f24a736354c9
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_copy_paste_group_profile.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu
+ layout="topleft"
+ name="Copy Group Profile Menu">
+ <menu_item_call
+ label="Copy Group Name"
+ layout="topleft"
+ name="copy_group_name">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_group_name"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Copy SLurl"
+ layout="topleft"
+ name="copy_slurl">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_group_slurl"/>
+ </menu_item_call>
+ <menu_item_call
+ label="Copy UUID"
+ layout="topleft"
+ name="copy_id">
+ <menu_item_call.on_click
+ function="Profile.Commit"
+ parameter="copy_group_id"/>
+ </menu_item_call>
+</toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 5efb8f90a45f5f3da67c7e7e93036aeed5b61a2a..6ab86830e839b4a7a87a38fe09fbf3121829b71d 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -49,7 +49,7 @@ Hover your mouse over the options for more help.
type="string"
height="16"
length="1"
- left_pad="8"
+ left_pad="6"
name="prepend_founded_by"
top_delta="0">
Founder:
@@ -58,7 +58,7 @@ Hover your mouse over the options for more help.
follows="left|top|right"
height="16"
layout="topleft"
- left_delta="-2"
+ left_delta="0"
name="founder_name"
top_pad="2"
use_ellipses="true"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index fabfe62d3180c2a46f4727497644bd1a5866d3e5..31a8668df025050c8f379b092de6252a2f242795 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -28,14 +28,14 @@ background_visible="true"
</panel.string>
<panel
name="group_info_top"
- follows="top|left"
+ follows="top|left|right"
top="0"
left="0"
- height="29"
- width="313"
+ height="45"
+ width="308"
layout="topleft">
<button
- follows="top|right"
+ follows="top|left"
height="24"
image_hover_unselected="BackButton_Over"
image_pressed="BackButton_Press"
@@ -67,26 +67,63 @@ background_visible="true"
word_wrap="false"
mouse_opaque="false"/>
<line_editor
- follows="left|top"
+ follows="left|top|right"
font="SansSerif"
label="Type your new group name here"
layout="topleft"
- left_delta="10"
+ left_delta="0"
max_length_bytes="35"
name="group_name_editor"
top_delta="5"
width="270"
height="20"
visible="false" />
+ <text
+ top_pad="4"
+ left="6"
+ height="16"
+ width="25"
+ layout="topleft"
+ follows="left|top"
+ name="Key:"
+ value="Key:"/>
+ <line_editor
+ top_delta="-1"
+ left_pad="0"
+ height="16"
+ layout="topleft"
+ follows="left|top|right"
+ name="group_key"
+ border_thickness="0"
+ use_bg_color="false"
+ background_image_disabled=""
+ background_image_focused=""
+ enabled="false"
+ max_length_bytes="254"
+ value="00000000-0000-0000-0000-000000000000"
+ width="258"/>
+ <menu_button
+ menu_filename="menu_copy_paste_group_profile.xml"
+ follows="top|right"
+ height="15"
+ image_disabled="ClipboardMenu_Disabled"
+ image_selected="ClipboardMenu_Press"
+ image_unselected="ClipboardMenu_Off"
+ layout="topleft"
+ top_delta="0"
+ right="-1"
+ name="clipboard_group"
+ tool_tip="Paste options"
+ width="22"/>
</panel>
<layout_stack
name="layout"
orientation="vertical"
follows="all"
- left="8"
+ left="0"
top_pad="0"
- height="506"
- width="292"
+ height="491"
+ width="310"
border_size="0">
<layout_panel
bg_alpha_color="PanelDefaultBackgroundColor"
@@ -99,7 +136,7 @@ background_visible="true"
auto_resize="true"
user_resize="true"
height="513"
- width="313">
+ width="310">
<accordion
left="0"
top="0"
@@ -109,7 +146,7 @@ background_visible="true"
layout="topleft"
name="groups_accordion"
height="513"
- width="313">
+ width="310">
<accordion_tab
expanded="true"
layout="topleft"