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

All places just av/group names were being used are now name ui

Browse Source 
Since NameBoxes are clickable, remove redundant profile buttons.
Removes a ton of RLV logic, now centralized inside LLNameUI
Removes excess functions that went largely unused

May no longer show if parcel sale is pending under the owner field,
this is weird and it's hard to keep this behavior

Also includes the missing setValue and getValue so this compiles,
that should've been committed way earlier, oops

Also adds ability for name_box to have is_group attribute, too!
This commit is contained in:
Liru Færs
2019-10-09 23:57:01 -04:00
parent d54bf78c08
commit d277f1750d
31 changed files with 151 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

190
indra/newview/llpanelpermissions.cpp
View File

@@ -69,10 +69,6 @@
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
// base and own must have EXPORT, next owner must be UNRESTRICTED
bool can_set_export(const U32& base, const U32& own, const U32& next)
{
@@ -117,13 +113,7 @@ BOOL LLPanelPermissions::postBuild()
childSetCommitCallback("Object Description",LLPanelPermissions::onCommitDesc,this);
getChild<LLLineEditor>("Object Description")->setPrevalidate(&LLLineEditor::prevalidatePrintableNotPipe);
getChild<LLUICtrl>("button owner profile")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickOwner,this));
getChild<LLUICtrl>("button last owner profile")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickLastOwner,this));
getChild<LLUICtrl>("button creator profile")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickCreator,this));
getChild<LLUICtrl>("button set group")->setCommitCallback(boost::bind(&LLPanelPermissions::onClickGroup,this));
getChild<LLUICtrl>("button open group")->setCommitCallback(boost::bind(LLPanelPermissions::onClickOpenGroup));
childSetCommitCallback("checkbox share with group",LLPanelPermissions::onCommitGroupShare,this);
@@ -182,25 +172,33 @@ void LLPanelPermissions::disableAll()
getChild<LLUICtrl>("pathfinding_attributes_value")->setValue(LLStringUtil::null);
getChildView("Creator:")->setEnabled(FALSE);
getChild<LLUICtrl>("Creator Name")->setValue(LLStringUtil::null);
getChildView("Creator Name")->setEnabled(FALSE);
getChildView("button creator profile")->setEnabled(FALSE);
if (auto view = getChildView("Creator Name"))
{
view->setValue(LLUUID::null);
view->setEnabled(FALSE);
}
getChildView("Owner:")->setEnabled(FALSE);
getChild<LLUICtrl>("Owner Name")->setValue(LLStringUtil::null);
getChildView("Owner Name")->setEnabled(FALSE);
getChildView("button owner profile")->setEnabled(FALSE);
if (auto view = getChildView("Owner Name"))
{
view->setValue(LLUUID::null);
view->setEnabled(FALSE);
}
getChildView("Last Owner:")->setEnabled(FALSE);
getChild<LLUICtrl>("Last Owner Name")->setValue(LLStringUtil::null);
getChildView("Last Owner Name")->setEnabled(FALSE);
getChildView("button last owner profile")->setEnabled(FALSE);
if (auto view = getChildView("Last Owner Name"))
{
view->setValue(LLUUID::null);
view->setEnabled(FALSE);
}
getChildView("Group:")->setEnabled(FALSE);
getChild<LLUICtrl>("Group Name Proxy")->setValue(LLStringUtil::null);
getChildView("Group Name Proxy")->setEnabled(FALSE);
if (auto view = getChildView("Group Name Proxy"))
{
view->setValue(LLUUID::null);
view->setEnabled(FALSE);
}
getChildView("button set group")->setEnabled(FALSE);
getChildView("button open group")->setEnabled(FALSE);
LLLineEditor* ed = getChild<LLLineEditor>("Object Name");
ed->setValue(LLStringUtil::null);
@@ -385,18 +383,6 @@ void LLPanelPermissions::refresh()
// Update creator text field
getChildView("Creator:")->setEnabled(TRUE);
// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a
BOOL creators_identical = FALSE;
// [/RLVa:KB]
std::string creator_name;
// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a
creators_identical = LLSelectMgr::getInstance()->selectGetCreator(mCreatorID, creator_name);
// [/RLVa:KB]
// LLSelectMgr::getInstance()->selectGetCreator(mCreatorID, creator_name);
// getChild<LLUICtrl>("Creator Name")->setValue(creator_name);
// getChildView("Creator Name")->setEnabled(TRUE);
// [RLVa:KB] - Moved further down to avoid an annoying flicker when the text is set twice in a row
// Update owner text field
getChildView("Owner:")->setEnabled(TRUE);
@@ -404,101 +390,29 @@ void LLPanelPermissions::refresh()
// Update last owner text field
getChildView("Last Owner:")->setEnabled(TRUE);
std::string owner_name;
const BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_name);
std::string owner_app_link;
const BOOL owners_identical = LLSelectMgr::getInstance()->selectGetOwner(mOwnerID, owner_app_link);
// LL_INFOS() << "owners_identical " << (owners_identical ? "TRUE": "FALSE") << LL_ENDL;
std::string last_owner_name;
LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name);
if (mOwnerID.isNull())
if (auto view = getChildView("Creator Name"))
{
if(LLSelectMgr::getInstance()->selectIsGroupOwned())
{
// Group owned already displayed by selectGetOwner
}
else
{
// Display last owner if public
std::string last_owner_name;
LLSelectMgr::getInstance()->selectGetLastOwner(mLastOwnerID, last_owner_name);
// It should never happen that the last owner is null and the owner
// is null, but it seems to be a bug in the simulator right now. JC
if (!mLastOwnerID.isNull() && !last_owner_name.empty())
{
owner_name.append(", last ");
owner_name.append( last_owner_name );
}
}
view->setValue(mCreatorID);
view->setEnabled(true);
}
// getChild<LLUICtrl>("Owner Name")->setValue(owner_name);
// getChildView("Owner Name")->setEnabled(TRUE);
// [RLVa:KB] - Moved further down to avoid an annoying flicker when the text is set twice in a row
// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a
bool fRlvEnableOwner = true;
bool fRlvEnableCreator = true;
bool fRlvEnableLastOwner = true;
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
if (auto view = getChild<LLUICtrl>("Owner Name"))
{
// Only anonymize the creator if all of the selection was created by the same avie who's also the owner or they're a nearby avie
if ( (creators_identical) && (mCreatorID != gAgent.getID()) && ((mCreatorID == mOwnerID) || (RlvUtil::isNearbyAgent(mCreatorID))) )
{
creator_name = RlvStrings::getAnonym(creator_name);
fRlvEnableCreator = false;
}
// Only anonymize the owner name if all of the selection is owned by the same avie and isn't group owned
if ( (owners_identical) && (!LLSelectMgr::getInstance()->selectIsGroupOwned()) && (mOwnerID != gAgent.getID()) )
{
owner_name = RlvStrings::getAnonym(owner_name);
fRlvEnableOwner = false;
}
if (RlvUtil::isNearbyAgent(mLastOwnerID))
{
last_owner_name = RlvStrings::getAnonym(last_owner_name);
fRlvEnableLastOwner = false;
}
view->setValue(mOwnerID);
view->setEnabled(true);
}
else if ((objectp->isAttachment() || objectp->isAvatar()) && gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMETAGS) && mOwnerID != gAgentID)
if (auto view = getChild<LLUICtrl>("Last Owner Name"))
{
owner_name = RlvStrings::getAnonym(owner_name);
fRlvEnableOwner = false;
if (mOwnerID == mCreatorID)
{
creator_name = RlvStrings::getAnonym(creator_name);
fRlvEnableCreator = false;
}
if (mOwnerID == mLastOwnerID)
{
last_owner_name = RlvStrings::getAnonym(last_owner_name);
fRlvEnableLastOwner = false;
}
view->setValue(mLastOwnerID);
view->setEnabled(true);
}
// [/RLVa:KB]
getChild<LLUICtrl>("Creator Name")->setValue(creator_name);
getChildView("Creator Name")->setEnabled(TRUE);
getChild<LLUICtrl>("Owner Name")->setValue(owner_name);
getChildView("Owner Name")->setEnabled(TRUE);
// childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
// getChildView("button last owner profile")->setEnabled(owners_identical && mLastOwnerID.notNull());
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
getChildView("button owner profile")->setEnabled(fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
getChildView("button creator profile")->setEnabled(fRlvEnableCreator && creators_identical && mCreatorID.notNull());
getChildView("button last owner profile")->setEnabled(fRlvEnableLastOwner && owners_identical && mLastOwnerID.notNull());
// [/RLVa:KB]
getChild<LLUICtrl>("Last Owner Name")->setValue(last_owner_name);
getChildView("Last Owner Name")->setEnabled(TRUE);
// update group text field
getChildView("Group:")->setEnabled(TRUE);
//getChild<LLUICtrl>("Group Name")->setValue(LLStringUtil::null);
LLUUID group_id;
BOOL groups_identical = LLSelectMgr::getInstance()->selectGetGroup(group_id);
if (groups_identical)
@@ -520,7 +434,6 @@ void LLPanelPermissions::refresh()
}
getChildView("button set group")->setEnabled(root_selected && owners_identical && (mOwnerID == gAgent.getID()) && is_nonpermanent_enforced);
getChildView("button open group")->setEnabled(group_id.notNull());
getChildView("Name:")->setEnabled(TRUE);
LLLineEditor* LineEditorObjectName = getChild<LLLineEditor>("Object Name");
@@ -1049,36 +962,6 @@ void LLPanelPermissions::onClickRelease(void*)
LLSelectMgr::getInstance()->sendOwner(LLUUID::null, LLUUID::null);
}
void LLPanelPermissions::onClickCreator()
{
LLAvatarActions::showProfile(mCreatorID);
}
void LLPanelPermissions::onClickOwner()
{
if (LLSelectMgr::getInstance()->selectIsGroupOwned())
{
LLUUID group_id;
LLSelectMgr::getInstance()->selectGetGroup(group_id);
LLGroupActions::show(group_id);
}
else
{
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
{
LLAvatarActions::showProfile(mOwnerID);
}
// [/RLVa:KB]
// LLAvatarActions::showProfile(mOwnerID);
}
}
void LLPanelPermissions::onClickLastOwner()
{
LLAvatarActions::showProfile(mLastOwnerID);
}
void LLPanelPermissions::onClickGroup()
{
LLUUID owner_id;
@@ -1103,13 +986,6 @@ void LLPanelPermissions::onClickGroup()
}
}
void LLPanelPermissions::onClickOpenGroup()
{
LLUUID group_id;
LLSelectMgr::getInstance()->selectGetGroup(group_id);
LLGroupActions::show(group_id);
}
void LLPanelPermissions::cbGroupID(LLUUID group_id)
{
if(mLabelGroupName)