Merge branch 'merge-1.21.6' into rebranding

Conflicts:
	linden/indra/newview/installers/windows/installer_template.nsi
	linden/indra/newview/llappviewer.cpp

1 files changed, 4 insertions, 4 deletions

diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index 37ad05e..d8813b3 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -270,21 +270,21 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
                 }
 
                 std::string info_text;
-                LLUIString traffic = self->getUIString("traffic_text");
+                LLUIString traffic = self->getString("traffic_text");
                 traffic.setArg("[TRAFFIC]", llformat("%d ", (int)dwell));
                 info_text = traffic;
-                LLUIString area = self->getUIString("area_text");
+                LLUIString area = self->getString("area_text");
                 area.setArg("[AREA]", llformat("%d", actual_area));
                 info_text += area;
                 if (flags & DFQ_FOR_SALE)
                 {
-                        LLUIString forsale = self->getUIString("forsale_text");
+                        LLUIString forsale = self->getString("forsale_text");
                         forsale.setArg("[PRICE]", llformat("%d", sale_price));
                         info_text += forsale;
                 }
                 if (auction_id != 0)
                 {
-                        LLUIString auction = self->getUIString("auction_text");
+                        LLUIString auction = self->getString("auction_text");
                         auction.setArg("[ID]", llformat("%010d ", auction_id));
                         info_text += auction;
                 }