From 253e9ccae892a98814d33f71d85404f8b3a58684 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 26 Feb 2019 19:26:54 +0100
Subject: [PATCH] FIRE-23641: Show parcel name in world map feature fails if
 the parcel has a null name

---
 indra/newview/llfloaterworldmap.cpp                      | 2 +-
 indra/newview/skins/default/xui/de/floater_world_map.xml | 3 +++
 indra/newview/skins/default/xui/en/floater_world_map.xml | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 7f13a136f1..bb10a27c88 100644
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -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)
diff --git a/indra/newview/skins/default/xui/de/floater_world_map.xml b/indra/newview/skins/default/xui/de/floater_world_map.xml
index 7b1cdbcfeb..e730bda4c1 100644
--- a/indra/newview/skins/default/xui/de/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/de/floater_world_map.xml
@@ -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">
diff --git a/indra/newview/skins/default/xui/en/floater_world_map.xml b/indra/newview/skins/default/xui/en/floater_world_map.xml
index c9f0024a70..4f156d5b84 100644
--- a/indra/newview/skins/default/xui/en/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_world_map.xml
@@ -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"