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

12
indra/newview/llfloaterbuyland.cpp
View File

@@ -176,7 +176,7 @@ public:
void updateFloaterCovenantText(const std::string& string, const LLUUID &asset_id);
void updateFloaterEstateName(const std::string& name);
void updateFloaterLastModified(const std::string& text);
void updateFloaterEstateOwnerName(const std::string& name);
void updateFloaterEstateOwnerID(const LLUUID& id);
void updateWebSiteInfo();
void finishWebSiteInfo();
@@ -263,12 +263,12 @@ void LLFloaterBuyLand::updateLastModified(const std::string& text)
}
// static
void LLFloaterBuyLand::updateEstateOwnerName(const std::string& name)
void LLFloaterBuyLand::updateEstateOwnerID(const LLUUID& id)
{
LLFloaterBuyLandUI* floater = LLFloaterBuyLandUI::instanceExists() ? LLFloaterBuyLandUI::getInstance() : NULL;
LLFloaterBuyLandUI* floater = LLFloaterBuyLandUI::instanceExists() ? LLFloaterBuyLandUI::getInstance() : nullptr;
if (floater)
{
floater->updateFloaterEstateOwnerName(name);
floater->updateFloaterEstateOwnerID(id);
}
}
@@ -629,10 +629,10 @@ void LLFloaterBuyLandUI::updateFloaterLastModified(const std::string& text)
if (editor) editor->setText(text);
}
void LLFloaterBuyLandUI::updateFloaterEstateOwnerName(const std::string& name)
void LLFloaterBuyLandUI::updateFloaterEstateOwnerID(const LLUUID& id)
{
LLTextBox* box = getChild<LLTextBox>("estate_owner_text");
if (box) box->setText(name);
if (box) box->setValue(id);
}
void LLFloaterBuyLandUI::updateWebSiteInfo()

2
indra/newview/llfloaterbuyland.h
View File

@@ -46,7 +46,7 @@ public:
static void updateCovenantText(const std::string& string, const LLUUID& asset_id);
static void updateEstateName(const std::string& name);
static void updateLastModified(const std::string& text);
static void updateEstateOwnerName(const std::string& name);
static void updateEstateOwnerID(const LLUUID& id);
};
#endif

92
indra/newview/llfloaterland.cpp
View File

@@ -368,7 +368,6 @@ LLPanelLandGeneral::LLPanelLandGeneral(LLParcelSelectionHandle& parcel)
, mBtnDeedToGroup(nullptr)
, mBtnSetGroup(nullptr)
, mTextOwner(nullptr)
, mBtnProfile(nullptr)
, mContentRating(nullptr)
, mLandType(nullptr)
, mTextGroup(nullptr)
@@ -414,19 +413,13 @@ BOOL LLPanelLandGeneral::postBuild()
mContentRating = getChild<LLTextBox>("ContentRatingText");
mLandType = getChild<LLTextBox>("LandTypeText");
mBtnProfile = getChild<LLButton>("Profile...");
mBtnProfile->setClickedCallback(boost::bind(&LLPanelLandGeneral::onClickProfile, this));
mTextGroup = getChild<LLTextBox>("GroupText");
mBtnSetGroup = getChild<LLButton>("Set...");
mBtnSetGroup->setCommitCallback(boost::bind(&LLPanelLandGeneral::onClickSetGroup, this));
getChild<LLButton>("group_profile")->setClickedCallback(onClickInfoGroup, this);
mCheckDeedToGroup = getChild<LLCheckBoxCtrl>( "check deed");
childSetCommitCallback("check deed", onCommitAny, this);
@@ -564,14 +557,12 @@ void LLPanelLandGeneral::refresh()
mCheckContributeWithDeed->set(FALSE);
mCheckContributeWithDeed->setEnabled(FALSE);
mTextOwner->setText(LLStringUtil::null);
mTextOwner->setValue(LLUUID::null);
mContentRating->setText(LLStringUtil::null);
mLandType->setText(LLStringUtil::null);
mBtnProfile->setLabel(getString("profile_text"));
mBtnProfile->setEnabled(FALSE);
mTextClaimDate->setText(LLStringUtil::null);
mTextGroup->setText(LLStringUtil::null);
mTextGroup->setValue(LLUUID::null);
mTextPrice->setText(LLStringUtil::null);
mSaleInfoForSale1->setVisible(FALSE);
@@ -626,16 +617,19 @@ void LLPanelLandGeneral::refresh()
BOOL can_be_sold = owner_sellable || estate_manager_sellable;
const LLUUID &owner_id = parcel->getOwnerID();
const LLUUID& group_id = parcel->getGroupID();
BOOL is_public = parcel->isPublic();
bool group_owned = parcel->getIsGroupOwned();
// Is it owned?
mTextOwner->setValue(is_public ? LLUUID::null : LLSD().with("id", owner_id).with("group", group_owned));
mTextGroup->setValue(is_public ? LLUUID::null : group_id);
if (is_public)
{
mTextSalePending->setText(LLStringUtil::null);
mTextSalePending->setEnabled(FALSE);
mTextOwner->setText(getString("public_text"));
mTextOwner->setEnabled(FALSE);
mBtnProfile->setEnabled(FALSE);
mTextClaimDate->setText(LLStringUtil::null);
mTextClaimDate->setEnabled(FALSE);
mTextGroup->setText(getString("none_text"));
@@ -665,21 +659,13 @@ void LLPanelLandGeneral::refresh()
mTextOwner->setEnabled(TRUE);
// We support both group and personal profiles
mBtnProfile->setEnabled(TRUE);
if (parcel->getGroupID().isNull())
if (group_id.isNull())
{
// Not group owned, so "Profile"
mBtnProfile->setLabel(getString("profile_text"));
mTextGroup->setText(getString("none_text"));
mTextGroup->setEnabled(FALSE);
}
else
{
// Group owned, so "Info"
mBtnProfile->setLabel(getString("info_text"));
//mTextGroup->setText("HIPPOS!");//parcel->getGroupName());
mTextGroup->setEnabled(TRUE);
}
@@ -702,9 +688,7 @@ void LLPanelLandGeneral::refresh()
mEditDesc->setEnabled(can_edit_identity);
BOOL can_edit_agent_only = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_NO_POWERS);
mBtnSetGroup->setEnabled(can_edit_agent_only && !parcel->getIsGroupOwned());
const LLUUID& group_id = parcel->getGroupID();
mBtnSetGroup->setEnabled(can_edit_agent_only && !group_owned);
// Can only allow deeding if you own it and it's got a group.
BOOL enable_deed = (owner_id == gAgent.getID()
@@ -723,7 +707,7 @@ void LLPanelLandGeneral::refresh()
mBtnDeedToGroup->setEnabled( parcel->getAllowDeedToGroup()
&& group_id.notNull()
&& can_deed
&& !parcel->getIsGroupOwned()
&& !group_owned
);
mEditName->setText( parcel->getName() );
@@ -838,34 +822,24 @@ void LLPanelLandGeneral::refreshNames()
LLParcel *parcel = mParcel->getParcel();
if (!parcel)
{
mTextOwner->setText(LLStringUtil::null);
mTextGroup->setText(LLStringUtil::null);
mTextOwner->setValue(LLUUID::null);
mTextGroup->setValue(LLUUID::null);
return;
}
std::string owner;
if (parcel->getIsGroupOwned())
bool group_owned = parcel->getIsGroupOwned();
mTextOwner->setValue(LLSD().with("id", parcel->getOwnerID()).with("group", group_owned));
if (group_owned)
{
owner = getString("group_owned_text");
}
else
{
// Figure out the owner's name
gCacheName->getFullName(parcel->getOwnerID(), owner);
mTextOwner->setText(getString("group_owned_text"));
}
if(LLParcel::OS_LEASE_PENDING == parcel->getOwnershipStatus())
{
owner += getString("sale_pending_text");
mTextOwner->setText(mTextOwner->getText() + getString("sale_pending_text"));
}
mTextOwner->setText(owner);
std::string group;
if (!parcel->getGroupID().isNull())
{
gCacheName->getGroupName(parcel->getGroupID(), group);
}
mTextGroup->setText(group);
mTextGroup->setValue(parcel->getGroupID());
if (parcel->getForSale())
{
@@ -907,32 +881,6 @@ void LLPanelLandGeneral::onClickSetGroup()
}
}
// static
void LLPanelLandGeneral::onClickInfoGroup(void* userdata)
{
LLPanelLandGeneral* panelp = (LLPanelLandGeneral*)userdata;
LLParcel* parcel = panelp->mParcel->getParcel();
if (!parcel) return;
LLGroupActions::show(parcel->getGroupID());
}
void LLPanelLandGeneral::onClickProfile()
{
LLParcel* parcel = mParcel->getParcel();
if (!parcel) return;
if (parcel->getIsGroupOwned())
{
const LLUUID& group_id = parcel->getGroupID();
LLGroupActions::show(group_id);
}
else
{
const LLUUID& avatar_id = parcel->getOwnerID();
LLAvatarActions::showProfile(avatar_id);
}
}
// public
void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
{
@@ -942,7 +890,6 @@ void LLPanelLandGeneral::setGroup(const LLUUID& group_id)
// Set parcel properties and send message
parcel->setGroupID(group_id);
//parcel->setGroupName(group_name);
//mTextGroup->setText(group_name);
// Send update
LLViewerParcelMgr::getInstance()->sendParcelPropertiesUpdate(parcel);
@@ -3145,13 +3092,12 @@ void LLPanelLandCovenant::updateLastModified(const std::string& text)
}
// static
void LLPanelLandCovenant::updateEstateOwnerName(const std::string& name)
void LLPanelLandCovenant::updateEstateOwnerID(const LLUUID& id)
{
LLPanelLandCovenant* self = LLFloaterLand::getCurrentPanelLandCovenant();
if (self)
{
LLTextBox* editor = self->getChild<LLTextBox>("estate_owner_text");
if (editor) editor->setText(name);
self->getChildView("estate_owner_text")->setValue(id);
}
}

7
indra/newview/llfloaterland.h
View File

@@ -148,9 +148,7 @@ public:
virtual void draw();
void setGroup(const LLUUID& group_id);
void onClickProfile();
void onClickSetGroup();
static void onClickInfoGroup(void*);
static void onClickDeed(void*);
static void onClickBuyLand(void* data);
static void onClickScriptLimits(void* data);
@@ -191,8 +189,7 @@ protected:
LLButton* mBtnSetGroup;
LLTextBox* mTextOwner;
LLButton* mBtnProfile;
LLTextBox* mContentRating;
LLTextBox* mLandType;
@@ -406,7 +403,7 @@ public:
static void updateCovenantText(const std::string& string);
static void updateEstateName(const std::string& name);
static void updateLastModified(const std::string& text);
static void updateEstateOwnerName(const std::string& name);
static void updateEstateOwnerID(const LLUUID& id);
protected:
LLSafeHandle<LLParcelSelection>& mParcel;

79
indra/newview/llfloaterproperties.cpp
View File

@@ -168,12 +168,6 @@ BOOL LLFloaterProperties::postBuild()
getChild<LLUICtrl>("LabelItemName")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitName,this));
getChild<LLLineEditor>("LabelItemDesc")->setPrevalidate(&LLLineEditor::prevalidatePrintableNotPipe);
getChild<LLUICtrl>("LabelItemDesc")->setCommitCallback(boost::bind(&LLFloaterProperties::onCommitDescription,this));
// Creator information
getChild<LLUICtrl>("BtnCreator")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickCreator,this));
// owner information
getChild<LLUICtrl>("BtnOwner")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickOwner,this));
// last owner information
getChild<LLUICtrl>("BtnLastOwner")->setCommitCallback(boost::bind(&LLFloaterProperties::onClickLastOwner,this));
// acquired date
// owner permissions
// Permissions debug text
@@ -226,11 +220,8 @@ void LLFloaterProperties::refresh()
"LabelItemName",
"LabelItemDesc",
"LabelCreatorName",
"BtnCreator",
"LabelOwnerName",
"BtnOwner",
"LabelLastOwnerName",
"BtnLastOwner",
"CheckOwnerModify",
"CheckOwnerCopy",
"CheckOwnerTransfer",
@@ -328,72 +319,46 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
if(!gCacheName) return;
if(!gAgent.getRegion()) return;
getChild<LLUICtrl>("LabelCreatorName")->setValue(item->getCreatorUUID());
if (item->getCreatorUUID().notNull())
{
std::string name;
gCacheName->getFullName(item->getCreatorUUID(), name);
getChildView("BtnCreator")->setEnabled(TRUE);
getChildView("LabelCreatorTitle")->setEnabled(TRUE);
getChildView("LabelCreatorName")->setEnabled(TRUE);
getChild<LLUICtrl>("LabelCreatorName")->setValue(name);
}
else
{
getChildView("BtnCreator")->setEnabled(FALSE);
getChildView("LabelCreatorTitle")->setEnabled(FALSE);
getChildView("LabelCreatorName")->setEnabled(FALSE);
getChild<LLUICtrl>("LabelCreatorName")->setValue(getString("unknown"));
getChild<LLTextBox>("LabelCreatorName")->setText(getString("unknown"));
}
getChild<LLUICtrl>("LabelLastOwnerName")->setValue(perm.getLastOwner());
if (perm.getLastOwner().notNull())
{
std::string name;
gCacheName->getFullName(perm.getLastOwner(), name);
getChildView("LabelLastOwnerTitle")->setEnabled(true);
getChildView("LabelLastOwnerName")->setEnabled(true);
getChild<LLUICtrl>("LabelLastOwnerName")->setValue(name);
}
else
{
getChildView("LabelLastOwnerTitle")->setEnabled(false);
getChildView("LabelLastOwnerName")->setEnabled(false);
getChild<LLUICtrl>("LabelLastOwnerName")->setValue(getString("unknown"));
getChild<LLTextBox>("LabelLastOwnerName")->setText(getString("unknown"));
}
////////////////
// OWNER NAME //
////////////////
getChild<LLUICtrl>("LabelOwnerName")->setValue(perm.getOwner());
if(perm.isOwned())
{
std::string name;
if (perm.isGroupOwned())
{
gCacheName->getGroupName(perm.getGroup(), name);
}
else
{
gCacheName->getFullName(perm.getOwner(), name);
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
{
name = RlvStrings::getAnonym(name);
}
// [/RLVa:KB]
}
getChildView("BtnOwner")->setEnabled(TRUE);
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e
getChildView("BtnOwner")->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
// [/RLVa:KB]
getChildView("LabelOwnerTitle")->setEnabled(TRUE);
getChildView("LabelOwnerName")->setEnabled(TRUE);
getChild<LLUICtrl>("LabelOwnerName")->setValue(name);
}
else
{
getChildView("BtnOwner")->setEnabled(FALSE);
getChildView("LabelOwnerTitle")->setEnabled(FALSE);
getChildView("LabelOwnerName")->setEnabled(FALSE);
getChild<LLUICtrl>("LabelOwnerName")->setValue(getString("public"));
getChild<LLTextBox>("LabelOwnerName")->setText(getString("public"));
}
//////////////////
@@ -609,38 +574,6 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
}
}
void LLFloaterProperties::onClickCreator()
{
LLInventoryItem* item = findItem();
if(!item) return;
LLAvatarActions::showProfile(item->getCreatorUUID());
}
// static
void LLFloaterProperties::onClickOwner()
{
LLInventoryItem* item = findItem();
if(!item) return;
if(item->getPermissions().isGroupOwned())
{
LLGroupActions::show(item->getPermissions().getGroup());
}
else
{
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
// [/RLVa:KB]
{
LLAvatarActions::showProfile(item->getPermissions().getOwner());
}
}
}
void LLFloaterProperties::onClickLastOwner()
{
if (const LLInventoryItem* item = findItem()) LLAvatarActions::showProfile(item->getPermissions().getLastOwner());
}
// static
void LLFloaterProperties::onCommitName()
{

3
indra/newview/llfloaterproperties.h
View File

@@ -74,9 +74,6 @@ public:
protected:
// ui callbacks
void onClickCreator();
void onClickOwner();
void onClickLastOwner();
void onCommitName();
void onCommitDescription();
void onCommitPermissions();

22
indra/newview/llfloaterregioninfo.cpp
View File

@@ -1676,12 +1676,12 @@ struct LLEstateAccessChangeInfo
};
// static
void LLPanelEstateInfo::updateEstateOwnerName(const std::string& name)
void LLPanelEstateInfo::updateEstateOwnerID(const LLUUID& id)
{
LLPanelEstateInfo* panelp = LLFloaterRegionInfo::getPanelEstate();
if (panelp)
{
panelp->setOwnerName(name);
panelp->getChild<LLUICtrl>("estate_owner")->setValue(id);
}
}
@@ -1800,7 +1800,7 @@ void LLPanelEstateInfo::refreshFromEstate()
const LLEstateInfoModel& estate_info = LLEstateInfoModel::instance();
getChild<LLUICtrl>("estate_name")->setValue(estate_info.getName());
LLAvatarNameCache::get(estate_info.getOwnerID(), boost::bind(&LLPanelEstateInfo::setOwnerName, this, boost::bind(&LLAvatarName::getNSName, _2, main_name_system())));
getChild<LLUICtrl>("estate_owner")->setValue(estate_info.getOwnerID());
getChild<LLUICtrl>("externally_visible_check")->setValue(estate_info.getIsExternallyVisible());
getChild<LLUICtrl>("voice_chat_check")->setValue(estate_info.getAllowVoiceChat());
@@ -1924,12 +1924,7 @@ void LLPanelEstateInfo::getEstateOwner()
const std::string LLPanelEstateInfo::getOwnerName() const
{
return getChild<LLUICtrl>("estate_owner")->getValue().asString();
}
void LLPanelEstateInfo::setOwnerName(const std::string& name)
{
getChild<LLUICtrl>("estate_owner")->setValue(LLSD(name));
return getChild<LLTextBox>("estate_owner")->getText();
}
// static
@@ -2294,12 +2289,12 @@ void LLPanelEstateCovenant::updateLastModified(const std::string& text)
}
// static
void LLPanelEstateCovenant::updateEstateOwnerName(const std::string& name)
void LLPanelEstateCovenant::updateEstateOwnerID(const LLUUID& id)
{
LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
if( panelp )
{
panelp->mEstateOwnerText->setText(name);
panelp->mEstateOwnerText->setValue(id);
}
}
@@ -2308,11 +2303,6 @@ std::string LLPanelEstateCovenant::getOwnerName() const
return mEstateOwnerText->getText();
}
void LLPanelEstateCovenant::setOwnerName(const std::string& name)
{
mEstateOwnerText->setText(name);
}
void LLPanelEstateCovenant::setCovenantTextEditor(const std::string& text)
{
mEditor->setText(text, false);

6
indra/newview/llfloaterregioninfo.h
View File

@@ -292,7 +292,7 @@ public:
void updateControls(LLViewerRegion* region);
static void updateEstateName(const std::string& name);
static void updateEstateOwnerName(const std::string& name);
static void updateEstateOwnerID(const LLUUID& id);
virtual bool refreshFromRegion(LLViewerRegion* region);
virtual bool estateUpdate(LLMessageSystem* msg);
@@ -307,7 +307,6 @@ public:
static bool isLindenEstate();
const std::string getOwnerName() const;
void setOwnerName(const std::string& name);
protected:
virtual BOOL sendUpdate();
@@ -355,14 +354,13 @@ public:
static void updateCovenantText(const std::string& string, const LLUUID& asset_id);
static void updateEstateName(const std::string& name);
static void updateLastModified(const std::string& text);
static void updateEstateOwnerName(const std::string& name);
static void updateEstateOwnerID(const LLUUID& id);
const LLUUID& getCovenantID() const { return mCovenantID; }
void setCovenantID(const LLUUID& id) { mCovenantID = id; }
std::string getEstateName() const;
void setEstateName(const std::string& name);
std::string getOwnerName() const;
void setOwnerName(const std::string& name);
void setCovenantTextEditor(const std::string& text);
typedef enum e_asset_status

1
indra/newview/llnamebox.cpp
View File

@@ -80,6 +80,7 @@ void LLNameBox::initFromXML(LLXMLNodePtr node, LLView* parent)
node->getAttributeString("initial_value", mInitialValue);
setText(mInitialValue);
node->getAttribute_bool("rlv_sensitive", mRLVSensitive);
node->getAttribute_bool("is_group", mIsGroup);
}
// static

2
indra/newview/llnamebox.h
View File

@@ -45,6 +45,8 @@ public:
static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
void setText(const std::string& text) override final { LLTextBox::setText(text); }
void setValue(const LLSD& value) override final { LLNameUI::setValue(value); }
LLSD getValue() const override final { return LLNameUI::getValue(); }
void showProfile();
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override final;

10
indra/newview/llnameeditor.cpp
View File

@@ -83,16 +83,6 @@ void LLNameEditor::setText(const std::string& text)
LLLineEditor::setText(text);
}
void LLNameEditor::setValue( const LLSD& value )
{
setNameID(value.asUUID(), FALSE);
}
LLSD LLNameEditor::getValue() const
{
return LLSD(mNameID);
}
// virtual
LLXMLNodePtr LLNameEditor::getXML(bool save_children) const
{

5
indra/newview/llnameeditor.h
View File

@@ -54,9 +54,8 @@ public:
LLXMLNodePtr getXML(bool save_children = true) const override final;
static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
// Take/return agent UUIDs
void setValue(const LLSD& value) override final;
LLSD getValue() const override final;
void setValue(const LLSD& value) override final { LLNameUI::setValue(value); }
LLSD getValue() const override final { return LLNameUI::getValue(); }
void setText(const std::string& text) override final;
};

11
indra/newview/llnameui.h
View File

@@ -52,6 +52,17 @@ struct LLNameUI : public LFIDBearer
virtual void setText(const std::string& text) = 0;
// Take either UUID or a map of "id" to UUID and "group" to boolean
virtual void setValue(const LLSD& value)
{
if (value.has("id"))
setNameID(value["id"].asUUID(), value["group"].asBoolean());
else
setNameID(value.asUUID(), mIsGroup);
}
// Return agent UUIDs
virtual LLSD getValue() const { return LLSD(mNameID); }
private:
static std::set<LLNameUI*> sInstances;

28
indra/newview/llpanelavatar.cpp
View File

@@ -141,7 +141,6 @@ LLPanelAvatarSecondLife::LLPanelAvatarSecondLife(const std::string& name,
LLPanelAvatarSecondLife::~LLPanelAvatarSecondLife()
{
mCacheConnection.disconnect();
LLMuteList::instance().removeObserver(this);
}
@@ -149,12 +148,6 @@ void LLPanelAvatarSecondLife::refresh()
{
}
void LLPanelAvatarSecondLife::updatePartnerName(const LLAvatarName& name)
{
mCacheConnection.disconnect();
childSetTextArg("partner_edit", "[NAME]", name.getNSName());
}
//-----------------------------------------------------------------------------
// clearControls()
// Empty the data out of the controls, since we have to wait for new
@@ -219,8 +212,7 @@ void LLPanelAvatarSecondLife::processProperties(void* data, EAvatarProcessorType
mPartnerID = pAvatarData->partner_id;
if (mPartnerID.notNull())
{
mCacheConnection.disconnect();
mCacheConnection = LLAvatarNameCache::get(mPartnerID, boost::bind(&LLPanelAvatarSecondLife::updatePartnerName, this, _2));
getChildView("partner_edit")->setValue(mPartnerID);
childSetEnabled("partner_info", TRUE);
}
}
@@ -401,7 +393,7 @@ BOOL LLPanelAvatarSecondLife::postBuild()
ctrl->setFallbackImageName("default_profile_picture.j2c");
auto show_pic = [&]
{
show_picture(getChild<LLTextureCtrl>("img")->getImageAssetID(), profile_picture_title(getChildView("dnname")->getValue()));
show_picture(getChild<LLTextureCtrl>("img")->getImageAssetID(), profile_picture_title(getChild<LLLineEditor>("dnname")->getText()));
};
auto show_pic_if_not_self = [=] { if (!ctrl->canChange()) show_pic(); };
@@ -1251,25 +1243,19 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
}
}
void LLPanelAvatar::onAvatarNameResponse(const LLUUID& agent_id, const LLAvatarName& av_name)
{
mCacheConnection.disconnect();
getChild<LLLineEditor>("dnname")->setText(gSavedSettings.getBOOL("SinguCompleteNameProfiles") ? av_name.getCompleteName() : av_name.getNSName());
}
void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id)
{
if (avatar_id.isNull()) return;
//BOOL avatar_changed = FALSE;
auto dnname = getChild<LLNameEditor>("dnname");
if (avatar_id != mAvatarID)
{
//avatar_changed = TRUE;
if (mAvatarID.notNull())
LLAvatarPropertiesProcessor::getInstance()->removeObserver(mAvatarID, this);
mAvatarID = avatar_id;
dnname->setNameID(avatar_id, false);
}
if (avatar_id.isNull()) return;
LLAvatarPropertiesProcessor::getInstance()->addObserver(mAvatarID, this);
// Determine if we have their calling card.
@@ -1294,8 +1280,6 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id)
if (LLDropTarget* drop_target = findChild<LLDropTarget>("drop_target_rect"))
drop_target->setEntityID(mAvatarID);
mCacheConnection.disconnect();
mCacheConnection = LLAvatarNameCache::get(avatar_id, boost::bind(&LLPanelAvatar::onAvatarNameResponse, this, _1, _2));
if (auto key_edit = getChildView("avatar_key"))
key_edit->setValue(mAvatarID.asString());

4
indra/newview/llpanelavatar.h
View File

@@ -119,11 +119,9 @@ public:
void clearControls();
void enableControls(BOOL own_avatar);
void updateOnlineText(BOOL online, BOOL have_calling_card);
void updatePartnerName(const LLAvatarName& name);
private:
LLUUID mPartnerID;
boost::signals2::connection mCacheConnection;
};
@@ -280,8 +278,6 @@ public:
void setAvatar(LLViewerObject *avatarp);
void onAvatarNameResponse(const LLUUID& agent_id, const LLAvatarName& av_name);
// Fill in the avatar ID and handle some field fill-in, as well as
// button enablement.
void setAvatarID(const LLUUID &avatar_id);

15
indra/newview/llpanelevent.cpp
View File

@@ -139,9 +139,8 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
msg->getU32("EventData", "EventID", event_id);
// look up all panels which have this avatar
for (panel_list_t::iterator iter = sAllPanels.begin(); iter != sAllPanels.end(); ++iter)
for (auto& self : sAllPanels)
{
LLPanelEvent* self = *iter;
// Skip updating panels which aren't for this event
if (self->mEventID != event_id)
{
@@ -152,6 +151,7 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
self->mTBCategory->setText(self->mEventInfo.mCategoryStr);
self->mTBDate->setText(self->mEventInfo.mTimeStr);
self->mTBDesc->setText(self->mEventInfo.mDesc, false);
self->mTBRunBy->setValue(self->mEventInfo.mRunByID);
self->mTBDuration->setText(llformat("%d:%.2d", self->mEventInfo.mDuration / 60, self->mEventInfo.mDuration % 60));
@@ -205,17 +205,6 @@ void LLPanelEvent::processEventInfoReply(LLMessageSystem *msg, void **)
}
}
void LLPanelEvent::draw()
{
std::string name;
gCacheName->getFullName(mEventInfo.mRunByID, name);
mTBRunBy->setText(name);
LLPanel::draw();
}
void LLPanelEvent::resetInfo()
{
// Clear all of the text fields.

1
indra/newview/llpanelevent.h
View File

@@ -51,7 +51,6 @@ public:
/*virtual*/ ~LLPanelEvent();
/*virtual*/ BOOL postBuild();
/*virtual*/ void draw();
void setEventID(const U32 event_id);
void sendEventInfoRequest();

13
indra/newview/llpanelgroupgeneral.cpp
View File

@@ -83,7 +83,6 @@ LLPanelGroupGeneral::LLPanelGroupGeneral(const std::string& name,
mGroupNameEditor(NULL),
mFounderName(NULL),
mInsignia(NULL),
mGroupName(NULL),
mEditCharter(NULL),
mBtnJoinGroup(NULL),
mListVisibleMembers(NULL),
@@ -121,8 +120,7 @@ BOOL LLPanelGroupGeneral::postBuild()
// General info
mGroupNameEditor = getChild<LLLineEditor>("group_name_editor", recurse);
mGroupName = getChild<LLTextBox>("group_name", recurse);
mInsignia = getChild<LLTextureCtrl>("insignia", recurse);
if (mInsignia)
{
@@ -263,7 +261,7 @@ BOOL LLPanelGroupGeneral::postBuild()
mBtnJoinGroup->setVisible(FALSE);
mBtnInfo->setVisible(FALSE);
mGroupName->setVisible(FALSE);
getChildView("group_name")->setVisible(FALSE);
}
std::string member_count(LLTrans::getString("LoadingData"));
@@ -731,10 +729,10 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
if (mInsignia) mInsignia->setEnabled(can_change_ident);
if (mEditCharter) mEditCharter->setEnabled(can_change_ident);
if (mGroupName) mGroupName->setText(gdatap->mName);
getChildView("group_name")->setValue(mGroupID);
if (mGroupNameEditor) mGroupNameEditor->setVisible(FALSE);
if (mFounderName) mFounderName->setNameID(gdatap->mFounderID,FALSE);
if (mFounderName) mFounderName->setValue(gdatap->mFounderID);
if (auto key_edit = getChildView("group_key"))
{
@@ -907,7 +905,6 @@ void LLPanelGroupGeneral::updateChanged()
LLUICtrl *check_list[] =
{
mGroupNameEditor,
mGroupName,
mFounderName,
mInsignia,
mEditCharter,

1
indra/newview/llpanelgroupgeneral.h
View File

@@ -91,7 +91,6 @@ private:
// Group information (include any updates in updateChanged)
LLLineEditor *mGroupNameEditor;
LLTextBox *mGroupName;
LLNameBox *mFounderName;
LLTextureCtrl *mInsignia;
LLTextEditor *mEditCharter;

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)

4
indra/newview/llpanelpermissions.h
View File

@@ -58,11 +58,7 @@ protected:
// statics
static void onClickClaim(void*);
static void onClickRelease(void*);
void onClickCreator();
void onClickOwner();
void onClickLastOwner();
void onClickGroup();
static void onClickOpenGroup();
void cbGroupID(LLUUID group_id);
static void onClickDeedToGroup(void*);
static void onClickCopyObjKey();

15
indra/newview/llviewermessage.cpp
View File

@@ -168,7 +168,6 @@ extern bool gShiftFrame;
// function prototypes
bool check_offer_throttle(const std::string& from_name, bool check_only);
bool check_asset_previewable(const LLAssetType::EType asset_type);
void callbackCacheEstateOwnerName(const LLUUID& id, const LLAvatarName& av_name);
static void process_money_balance_reply_extended(LLMessageSystem* msg);
//inventory offer throttle globals
@@ -8595,7 +8594,10 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
LLPanelEstateInfo::updateEstateName(estate_name);
LLFloaterBuyLand::updateEstateName(estate_name);
LLAvatarNameCache::get(estate_owner_id, boost::bind(&callbackCacheEstateOwnerName, _1, _2));
LLPanelEstateCovenant::updateEstateOwnerID(estate_owner_id);
LLPanelLandCovenant::updateEstateOwnerID(estate_owner_id);
LLPanelEstateInfo::updateEstateOwnerID(estate_owner_id);
LLFloaterBuyLand::updateEstateOwnerID(estate_owner_id);
// standard message, not from system
std::string last_modified;
@@ -8644,15 +8646,6 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
}
}
void callbackCacheEstateOwnerName(const LLUUID& id, const LLAvatarName& av_name)
{
const std::string name(av_name.getNSName());
LLPanelEstateCovenant::updateEstateOwnerName(name);
LLPanelLandCovenant::updateEstateOwnerName(name);
LLPanelEstateInfo::updateEstateOwnerName(name);
LLFloaterBuyLand::updateEstateOwnerName(name);
}
void onCovenantLoadComplete(LLVFS *vfs,
const LLUUID& asset_uuid,
LLAssetType::EType type,

27
indra/newview/skins/default/xui/en-us/floater_about_land.xml
View File

@@ -63,32 +63,25 @@
mouse_opaque="true" name="Owner:" v_pad="0" width="92">
Owner:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-140" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
mouse_opaque="true" name="OwnerText" v_pad="0">
Leyla Linden
</text>
<button bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
halign="center" height="16" label="Profile..." label_selected="Profile..."
left="350" mouse_opaque="true" name="Profile..." scale_image="true"
width="90" />
</name_box>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-160" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
mouse_opaque="true" name="Group:" v_pad="0" width="92">
Group:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-162" drop_shadow_visible="true" enabled="false" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
mouse_opaque="true" name="GroupText" v_pad="0" width="250" />
mouse_opaque="true" name="GroupText" v_pad="0" width="250" is_group="true"/>
<button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
halign="center" height="16" label="Set..." label_selected="Set..."
left="350" mouse_opaque="true" name="Set..." scale_image="true" width="50" />
<button bottom="-160" enabled="true" follows="left|top" font="SansSerifSmall"
halign="center" height="16" label="Info"
left="400" mouse_opaque="true" name="group_profile" scale_image="true" width="50" />
left="350" mouse_opaque="true" name="Set..." scale_image="true" width="90" />
<check_box bottom="-180" enabled="false" follows="left|top" font="SansSerifSmall"
height="16" initial_value="false" label="Allow Deed to Group" left="96"
mouse_opaque="true" name="check deed" radio_style="false"
@@ -240,12 +233,6 @@
<string name="group_owned_text">
(Group Owned)
</string>
<string name="profile_text">
Profile...
</string>
<string name="info_text">
Info...
</string>
<string name="public_text">
(public)
</string>
@@ -287,12 +274,12 @@ Go to World menu > About Land or select another parcel to show its details.
mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
Owner:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
mouse_opaque="false" name="estate_owner_text" v_pad="0">
(none)
</text>
</name_box>
<text_editor type="string" length="1" bottom="-175" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerifSmall" height="115"
left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"

4
indra/newview/skins/default/xui/en-us/floater_buy_land.xml
View File

@@ -37,11 +37,11 @@
width="100" word_wrap="true">
Estate Owner:
</text>
<text bottom_delta="0" follows="left|top"
<name_box bottom_delta="0" follows="left|top"
font="SansSerifSmall" height="20" left="550" name="estate_owner_text"
width="175">
(unknown)
</text>
</name_box>
<text follows="left|top" font="SansSerif" height="16"
left="440" name="resellable_changeable_label" right="725"
width="260" word_wrap="true">

27
indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
View File

@@ -31,45 +31,36 @@
mouse_opaque="true" name="LabelCreatorTitle" v_pad="0" width="78">
Creator:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="LabelCreatorName" v_pad="0" width="200">
mouse_opaque="true" name="LabelCreatorName" v_pad="0" width="200" rlv_sensitive="true">
Nicole Linden
</text>
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="" left_delta="174"
mouse_opaque="true" name="BtnCreator" width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="LabelOwnerTitle" v_pad="0" width="78">
Owner:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="LabelOwnerName" v_pad="0" width="200">
mouse_opaque="true" name="LabelOwnerName" v_pad="0" width="200" rlv_sensitive="true">
Thrax Linden
</text>
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="" left_delta="174"
mouse_opaque="true" name="BtnOwner" width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="LabelLastOwnerTitle" v_pad="0" width="78">
Last Owner:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="LabelLastOwnerName" v_pad="0" width="200">
mouse_opaque="true" name="LabelLastOwnerName" v_pad="0" width="200" rlv_sensitive="true">
OnceUponA Linden
</text>
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="" left_delta="174"
mouse_opaque="true" name="BtnLastOwner" width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

37
indra/newview/skins/default/xui/en-us/floater_tools.xml
View File

@@ -450,48 +450,36 @@
mouse_opaque="true" name="Creator:" v_pad="0" width="78">
Creator:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-66" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
mouse_opaque="true" name="Creator Name" v_pad="0" width="88" rlv_sensitive="true">
Thrax Linden
</text>
<button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="Profile..." left_delta="94"
mouse_opaque="true" name="button creator profile" scale_image="TRUE"
width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-86" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="Owner:" v_pad="0" width="78">
Owner:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-86" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
mouse_opaque="true" name="Owner Name" v_pad="0" width="88" rlv_sensitive="true">
Thrax Linden
</text>
<button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="Profile..." left_delta="94"
mouse_opaque="true" name="button owner profile" scale_image="TRUE"
width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
Last Owner:
</text>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="0" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88" rlv_sensitive="true">
Thrax Linden
</text>
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Profile..." label_selected="Profile..." left_delta="94"
mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
width="78" />
</name_box>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-126" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
@@ -505,13 +493,10 @@
bottom="-126"
left_delta="78"
name="Group Name Proxy"
width="142"/>
width="142" is_group="true"/>
<button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="Set" label_selected="Set..." left_delta="94"
height="16" label="Set" label_selected="Set..." left_delta="142"
mouse_opaque="true" name="button set group" scale_image="TRUE" width="30" />
<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
height="16" label="View" label_selected="Open" left_delta="30"
mouse_opaque="true" name="button open group" scale_image="TRUE" width="48" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"

13
indra/newview/skins/default/xui/en-us/panel_avatar.xml
View File

@@ -26,7 +26,7 @@
mouse_opaque="true" name="Name:" v_pad="0" width="70">
Name:
</text>
<line_editor bevel_style="in" border_style="line"
<name_editor bevel_style="in" border_style="line"
border_thickness="1" bottom="-48" enabled="false" follows="left|top"
font="SansSerifSmall" height="16" is_unicode="false" left_delta="75"
max_length="254" mouse_opaque="false" name="dnname"
@@ -75,14 +75,11 @@
<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
height="18" label="?" label_selected="?" left_delta="24"
mouse_opaque="true" name="partner_help" width="18" />
<line_editor bevel_style="in" border_style="line"
<name_editor bevel_style="in" border_style="line"
border_thickness="1" bottom_delta="-16" enabled="true" follows="left|top"
font="SansSerifSmall" height="16" is_unicode="false" left_delta="-119"
max_length="254" mouse_opaque="false" name="partner_edit"
tool_tip="Second Life partner. For more info on how to set, see www.secondlife.com/partner"
width="137">
[NAME]
</line_editor>
font="SansSerifSmall" height="16" left_delta="-119"
max_length="1024" mouse_opaque="true" name="partner_edit"
width="137"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-68" drop_shadow_visible="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"

4
indra/newview/skins/default/xui/en-us/panel_event.xml
View File

@@ -49,10 +49,10 @@
name="event_runby_label">
Run By:
</text>
<text bottom_delta="0" follows="top|left" font="SansSerif" left="120"
<name_box bottom_delta="0" follows="top|left" font="SansSerif" left="120"
name="event_runby">
(none)
</text>
</name_box>
<text bottom_delta="-16" follows="top|left" font="SansSerif" left="20"
name="event_location_label">
Location:

6
indra/newview/skins/default/xui/en-us/panel_group_general.xml
View File

@@ -19,12 +19,12 @@ Hover your mouse over the options for more help.
h_pad="0" halign="left" height="16" label="Type your new group name here"
left="7" max_length="35" mouse_opaque="true" name="group_name_editor"
prevalidate="ascii" v_pad="0" width="300" spell_check="true" />
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-20" drop_shadow_visible="true" follows="left|top"
font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
mouse_opaque="true" name="group_name" v_pad="0" width="300">
mouse_opaque="true" name="group_name" v_pad="0" width="300" is_group="true">
Type your new group name here
</text>
</name_box>
<text font="SansSerifSmall" name="prepend_founded_by">
Founded by
</text>

4
indra/newview/skins/default/xui/en-us/panel_region_covenant.xml
View File

@@ -25,12 +25,12 @@
mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
Owner:
</text>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
<name_box type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-65" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
mouse_opaque="false" name="estate_owner_text" v_pad="0">
(none)
</text>
</name_box>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"

4
indra/newview/skins/default/xui/en-us/panel_region_estate.xml
View File

@@ -64,7 +64,7 @@
width="150">
Estate owner:
</text>
<text
<name_box
type="string"
length="1"
follows="left|top"
@@ -77,7 +77,7 @@
use_ellipses="true"
width="290">
(unknown)
</text>
</name_box>
<view_border
bevel_style="none"