Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring back the Copy Key button and offer Copy SLURL as part of a flyout instead.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-01-03 22:50:55 -05:00
parent 794027d91e
commit eff4bc7ad6
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llpanelavatar.cpp
View File

@@ -1184,10 +1184,7 @@ BOOL LLPanelAvatar::postBuild()
ctrl->setEnabled(false);
getChild<LLUICtrl>("OK")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickOK, this));
getChild<LLUICtrl>("Cancel")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickCancel, this));
if (LLUICtrl* ctrl = findChild<LLUICtrl>("copy_key")) // Singu TODO: Bring this back
ctrl->setCommitCallback(boost::bind(&LLPanelAvatar::onClickGetKey, this));
void copy_profile_uri(const LLUUID& id, bool group);
getChild<LLUICtrl>("copy_uri")->setCommitCallback(boost::bind(copy_profile_uri, boost::bind(&LLPanelAvatar::getAvatarID, this), false));
getChild<LLUICtrl>("copy_flyout")->setCommitCallback(boost::bind(&LLPanelAvatar::onClickCopy, this, _2));
getChildView("web_profile")->setVisible(!gSavedSettings.getString("WebProfileURL").empty());
if (mTab && !sAllowFirstLife)
@@ -1421,11 +1418,18 @@ void LLPanelAvatar::resetGroupList()
}
}
void LLPanelAvatar::onClickGetKey()
void LLPanelAvatar::onClickCopy(const LLSD& val)
{
const LLUUID& agent_id(getAvatarID());
llinfos << "Copy agent id: " << agent_id << llendl;
gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(agent_id.asString()));
if (val.isUndefined())
{
llinfos << "Copy agent id: " << mAvatarID << llendl;
gViewerWindow->getWindow()->copyTextToClipboard(utf8str_to_wstring(mAvatarID.asString()));
}
else
{
void copy_profile_uri(const LLUUID& id, bool group = false);
copy_profile_uri(mAvatarID);
}
}
void LLPanelAvatar::onClickOK()