Skip to content
Snippets Groups Projects
Commit 59b10c2c authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-12335 Show parcel owner's name and icon in landmarks

parent 4043636c
No related branches found
No related tags found
No related merge requests found
......@@ -103,7 +103,6 @@ void LLPanelLandmarkInfo::resetLocation()
mLandmarkTitleEditor->setText(LLStringUtil::null);
mNotesEditor->setText(LLStringUtil::null);
mParcelOwner->setVisible(FALSE);
getChild<LLUICtrl>("parcel_owner_label")->setVisible(FALSE);
}
......@@ -162,7 +161,6 @@ void LLPanelLandmarkInfo::setInfoType(EInfoType type)
mLandmarkTitleEditor->setText(name);
}
mParcelOwner->setVisible(TRUE);
getChild<LLUICtrl>("parcel_owner_label")->setVisible(TRUE);
LLUUID owner_id = parcel->getOwnerID();
if (owner_id.notNull())
......@@ -236,11 +234,19 @@ void LLPanelLandmarkInfo::processParcelInfo(const LLParcelData& parcel_data)
if (parcel_data.owner_id.notNull())
{
// not suported and ivisible due to missing isGroupOwned flag
if (parcel_data.flags & 0x4) // depends onto DRTSIM-453
{
std::string owner_name = LLSLURL("group", parcel_data.owner_id, "inspect").getSLURLString();
mParcelOwner->setText(owner_name);
}
else
{
std::string owner_name = LLSLURL("agent", parcel_data.owner_id, "inspect").getSLURLString();
mParcelOwner->setText(owner_name);
}
}
else
{
mParcelOwner->setVisible(TRUE);
mParcelOwner->setText(getString("public"));
getChild<LLUICtrl>("parcel_owner_label")->setVisible(FALSE);
}
......
......@@ -45,7 +45,7 @@ struct LLParcelData
std::string desc;
S32 actual_area;
S32 billable_area;
U8 flags;
U8 flags; // group owned, maturity
F32 global_x;
F32 global_y;
F32 global_z;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment