From f0ef3a4569532ad82c753d0df68f2435f2436844 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sat, 4 May 2019 03:29:48 -0400 Subject: [PATCH] Fix defaulted inventory folder floater title --- indra/newview/lffloaterinvpanel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indra/newview/lffloaterinvpanel.cpp b/indra/newview/lffloaterinvpanel.cpp index 1a7f3e13f..8a1b739ce 100644 --- a/indra/newview/lffloaterinvpanel.cpp +++ b/indra/newview/lffloaterinvpanel.cpp @@ -40,7 +40,8 @@ LFFloaterInvPanel::LFFloaterInvPanel(const LLSD& cat, const std::string& name, L mPanel->setEnabled(true); addChild(mPanel); removeChild(panel); - setTitle(name.empty() ? mPanel->getRootFolder()->getLabel() : name); + const auto& title = name.empty() ? mPanel->getRootFolder()->getName() : name; + setTitle(title); // Figure out a unique name for our rect control const auto rect_control = llformat("FloaterInv%sRect", @@ -51,7 +52,7 @@ LFFloaterInvPanel::LFFloaterInvPanel(const LLSD& cat, const std::string& name, L if (gSavedSettings.controlExists(rect_control)) // Set our initial rect to the stored control setRect(gSavedSettings.getRect(rect_control)); else // Or create the rect control if it doesn't exist - gSavedSettings.declareRect(rect_control, getRect(), "Rectangle for " + getTitle() + " window"); + gSavedSettings.declareRect(rect_control, getRect(), "Rectangle for " + title + " window"); setRectControl(rect_control); }