From 1d4ad1772f4c4fff9e2b8a170f9a125614dfd00f Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Sat, 2 Dec 2017 12:08:52 -0600 Subject: [PATCH] Linux compile fixes. --- indra/newview/fspanelradar.cpp | 4 ---- indra/newview/fsradar.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/indra/newview/fspanelradar.cpp b/indra/newview/fspanelradar.cpp index e41ac28d08..438aea1883 100644 --- a/indra/newview/fspanelradar.cpp +++ b/indra/newview/fspanelradar.cpp @@ -366,10 +366,6 @@ void FSPanelRadar::updateList(const std::vector& entries, const LLSD& stat { row_data["columns"][2]["value"] = "avatar_in_region"; } - else - { - ""; - } row_data["columns"][3]["column"] = "typing_status"; row_data["columns"][3]["type"] = "icon"; diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp index f0c59eb59a..138d723a9c 100644 --- a/indra/newview/fsradar.cpp +++ b/indra/newview/fsradar.cpp @@ -51,7 +51,7 @@ #include "lltrans.h" #include "llviewercontrol.h" // for gSavedSettings #include "llviewermenu.h" // for gMenuHolder -#include "llViewerparcelmgr.h" +#include "llviewerparcelmgr.h" #include "llvoavatar.h" #include "llvoiceclient.h" #include "llworld.h"