FIRE-23641: Show parcel name in world map feature fails if the parcel has a null name

meow-7.2.2
Ansariel 2019-02-26 19:26:54 +01:00
parent c7bf7c88cb
commit 253e9ccae8
3 changed files with 5 additions and 1 deletions

View File

@ -690,7 +690,7 @@ void LLFloaterWorldMap::processParcelInfo(const LLParcelData& parcel_data, const
ll_round(region_y),
ll_round((F32)pos_global.mdV[VZ]));
LLTracker::trackLocation(pos_global, parcel_data.name, full_name);
LLTracker::trackLocation(pos_global, parcel_data.name.empty() ? getString("UnnamedParcel") : parcel_data.name, full_name);
}
void LLFloaterWorldMap::requestParcelInfo(const LLVector3d& pos_global)

View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<floater name="worldmap" title="Karte">
<floater.string name="UnnamedParcel">
(Unbenannte Parzelle)
</floater.string>
<layout_stack name="resizing_stack">
<layout_panel name="map_panel">
<panel name="map_details_selection">

View File

@ -14,6 +14,7 @@
single_instance="true"
title="World Map"
width="650">
<floater.string name="UnnamedParcel">(Unnamed Parcel)</floater.string>
<layout_stack
follows="all"
layout="topleft"