Skip to content
Snippets Groups Projects
Commit 07c04df9 authored by Sergei Litovchuk's avatar Sergei Litovchuk
Browse files
--HG--
branch : product-engine
parents 08d8056f cdefaf5e
No related branches found
No related tags found
No related merge requests found
...@@ -458,13 +458,13 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data) ...@@ -458,13 +458,13 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)
mSnapshotCtrl->setImageAssetID(parcel_data.snapshot_id); mSnapshotCtrl->setImageAssetID(parcel_data.snapshot_id);
} }
if(!parcel_data.name.empty()) if(!parcel_data.sim_name.empty())
{ {
mParcelName->setText(parcel_data.name); mRegionName->setText(parcel_data.sim_name);
} }
else else
{ {
mParcelName->setText(LLStringUtil::null); mRegionName->setText(LLStringUtil::null);
} }
if(!parcel_data.desc.empty()) if(!parcel_data.desc.empty())
...@@ -511,19 +511,22 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data) ...@@ -511,19 +511,22 @@ void LLPanelPlaceInfo::processParcelInfo(const LLParcelData& parcel_data)
region_z = llround(mPosRegion.mV[VZ]); region_z = llround(mPosRegion.mV[VZ]);
} }
std::string name = getString("not_available"); if (!parcel_data.name.empty())
if (!parcel_data.sim_name.empty())
{ {
name = llformat("%s (%d, %d, %d)", mParcelName->setText(llformat("%s (%d, %d, %d)",
parcel_data.sim_name.c_str(), region_x, region_y, region_z); parcel_data.name.c_str(), region_x, region_y, region_z));
mRegionName->setText(name); }
else
{
mParcelName->setText(getString("not_available"));
} }
if (mInfoType == CREATE_LANDMARK) if (mInfoType == CREATE_LANDMARK)
{ {
if (parcel_data.name.empty()) if (parcel_data.name.empty())
{ {
mTitleEditor->setText(name); mTitleEditor->setText(llformat("%s (%d, %d, %d)",
parcel_data.sim_name.c_str(), region_x, region_y, region_z));
} }
else else
{ {
......
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