diff --git a/indra/llcommon/llcurrencywrapper.h b/indra/llcommon/llcurrencywrapper.h
index d9f34cf0ed7359c8c23f5ea6149d0f65902853db..b2b38a5af1fb9db141b000d460928c0051e8cd1a 100644
--- a/indra/llcommon/llcurrencywrapper.h
+++ b/indra/llcommon/llcurrencywrapper.h
@@ -45,8 +45,8 @@ class LLCurrencyWrapper final : public LLSingleton<LLCurrencyWrapper>
public:
void setCurrency(const std::string& currency);
void setHomeCurrency(const std::string& currency);
- std::string getCurrency() const { return mCurrency; }
- std::string getHomeCurrency() const { return mHomeCurrency; }
+ const std::string& getCurrency() const { return mCurrency; }
+ const std::string& getHomeCurrency() const { return mHomeCurrency; }
std::string wrapCurrency(const std::string& to_substitute) const;
void wrapCurrency(std::string& to_substitute) const;
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 7902a357aa6e07cf74b00b22dc9923c96a5e988d..fcf4aaa58ca35ba246c0ea09d6639ef2766d0ec4 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -216,8 +216,8 @@ public:
void setImageOverlayBottomPad( S32 pad ) { mImageOverlayBottomPad = pad; }
S32 getImageOverlayBottomPad() const { return mImageOverlayBottomPad; }
- const std::string getLabelUnselected() const { return wstring_to_utf8str(mUnselectedLabel); }
- const std::string getLabelSelected() const { return wstring_to_utf8str(mSelectedLabel); }
+ const std::string& getLabelUnselected() const { return mUnselectedLabel.getString(); }
+ const std::string& getLabelSelected() const { return mSelectedLabel.getString(); }
void setImageColor(const LLColor4& c);
/*virtual*/ void setColor(const LLColor4& c) override;
diff --git a/indra/llui/llflatlistview.h b/indra/llui/llflatlistview.h
index d51686f8251dd1f36d347dc638e73920121bb5d7..46616657dd9ac9730be1e7f23b78521dac161e89 100644
--- a/indra/llui/llflatlistview.h
+++ b/indra/llui/llflatlistview.h
@@ -492,7 +492,7 @@ public:
* Sets up new filter string and filters the list.
*/
void setFilterSubString(const std::string& filter_str);
- std::string getFilterSubString() const { return mFilterSubString; }
+ const std::string& getFilterSubString() const { return mFilterSubString; }
/**
* Filters the list, rearranges and notifies parent about shape changes.
diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 8a100d33530fdefcb6e5f9c8c6216ba01c4ba93b..f454654a4353c351394f0eb84a7f6277554aa67b 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -1713,7 +1713,7 @@ void LLTabContainer::setTitle(const std::string& title)
}
}
-const std::string LLTabContainer::getPanelTitle(S32 index)
+const std::string& LLTabContainer::getPanelTitle(S32 index)
{
if (index >= 0 && index < (S32)mTabList.size())
{
diff --git a/indra/llui/lltabcontainer.h b/indra/llui/lltabcontainer.h
index 8f6263b01aba05b481c2c8e68fdf80900f02cd12..e1ed6e83fefdcba39ecdf5f5c1d4a9247b7aa48a 100644
--- a/indra/llui/lltabcontainer.h
+++ b/indra/llui/lltabcontainer.h
@@ -202,7 +202,7 @@ public:
void setTabImage(LLPanel* child, const LLUUID& img_id, const LLColor4& color = LLColor4::white);
void setTabImage(LLPanel* child, LLIconCtrl* icon);
void setTitle( const std::string& title );
- const std::string getPanelTitle(S32 index);
+ const std::string& getPanelTitle(S32 index);
void setTopBorderHeight(S32 height);
S32 getTopBorderHeight() const;
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 9b2442cb5253d81d5df26d7ec9419709e9e9c1c4..6b75cb17ac215b9343401f74f198b51f08e3f144 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -248,7 +248,7 @@ void LLView::setToolTipArgs( const LLStringUtil::format_map_t& args )
const std::string LLView::getToolTip() const
{
if (!mToolTipMsg || !mToolTipMsg[0])
- return "";
+ return std::string();
if (mTooltipArgs)
{
diff --git a/indra/newview/llaoengine.cpp b/indra/newview/llaoengine.cpp
index 369510264954d350a46a1477ae36c9c99ee369df..3a5fcc9a86196500fcd89b9767d45f7426f705b3 100644
--- a/indra/newview/llaoengine.cpp
+++ b/indra/newview/llaoengine.cpp
@@ -1264,7 +1264,7 @@ LLAOSet* LLAOEngine::getSetByName(const std::string& name) const
return found;
}
-const std::string LLAOEngine::getCurrentSetName() const
+const std::string& LLAOEngine::getCurrentSetName() const
{
if(mCurrentSet)
{
diff --git a/indra/newview/llaoengine.h b/indra/newview/llaoengine.h
index da9b04f6ce2ba5aeb2321952593701e9b80b2034..260279d72d6a9fe56621355978d549933750f43c 100644
--- a/indra/newview/llaoengine.h
+++ b/indra/newview/llaoengine.h
@@ -129,7 +129,7 @@ public:
static void onLoginComplete();
const std::vector<LLAOSet*> getSetList() const;
- const std::string getCurrentSetName() const;
+ const std::string& getCurrentSetName() const;
const LLAOSet* getDefaultSet() const;
bool renameSet(LLAOSet* set, const std::string& name);
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h
index f083ec7c8ce7ec28a443d70fa1b43ee036ed8391..9710f8680e3ca9921b031f0572888e34e345e23d 100644
--- a/indra/newview/llavatarlist.h
+++ b/indra/newview/llavatarlist.h
@@ -83,7 +83,7 @@ public:
void sortByName();
void setShowIcons(std::string param_name);
bool getIconsVisible() const { return mShowIcons; }
- const std::string getIconParamName() const {return mIconParamName;}
+ const std::string& getIconParamName() const {return mIconParamName;}
std::string getAvatarName(const LLAvatarName& av_name);
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override;
BOOL handleMouseDown( S32 x, S32 y, MASK mask ) override;
diff --git a/indra/newview/llfloaterbuyland.cpp b/indra/newview/llfloaterbuyland.cpp
index 071220a58be4aa92600641a87d4e3d96073e2135..c2dbb89944a139f9dfd36034e922c0c083edcf21 100644
--- a/indra/newview/llfloaterbuyland.cpp
+++ b/indra/newview/llfloaterbuyland.cpp
@@ -493,7 +493,7 @@ void LLFloaterBuyLandUI::updateCovenantInfo()
if(!region) return;
U8 sim_access = region->getSimAccess();
- std::string rating = LLViewerRegion::accessToString(sim_access);
+ const std::string& rating = LLViewerRegion::accessToString(sim_access);
LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
if (region_name)
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 5c9b12e14a8b3e545db21e14df682f533df3ef4c..88a5058934a99f09eaf91be7f7468dedca542aae 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -387,7 +387,7 @@ void LLInventoryPanel::setFilterSubString(const std::string& string)
getFilter().setFilterSubString(string);
}
-const std::string LLInventoryPanel::getFilterSubString()
+const std::string& LLInventoryPanel::getFilterSubString()
{
return getFilter().getFilterSubString();
}
diff --git a/indra/newview/llinventorypanel.h b/indra/newview/llinventorypanel.h
index 7d05bbd02d90874bc4727a2751baa32118d33bae..a61e8b3f3f1bb6a8ba0b28cb68e62459b8c96856 100644
--- a/indra/newview/llinventorypanel.h
+++ b/indra/newview/llinventorypanel.h
@@ -179,7 +179,7 @@ public:
U32 getFilterPermMask() const;
void setFilterWearableTypes(U64 filter);
void setFilterSubString(const std::string& string);
- const std::string getFilterSubString();
+ const std::string& getFilterSubString();
void setSinceLogoff(BOOL sl);
void setHoursAgo(U32 hours);
void setDateSearchDirection(U32 direction);
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 531d684b271e486c617968e54888914c67e38231..61ff6ed05c03bc8204bd3114568d71110901306c 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -655,7 +655,7 @@ void LLPanelMainInventory::onFilterSelected()
setFilterTextFromFilter();
}
-const std::string LLPanelMainInventory::getFilterSubString()
+const std::string& LLPanelMainInventory::getFilterSubString()
{
return mActivePanel->getFilterSubString();
}
diff --git a/indra/newview/llpanelmaininventory.h b/indra/newview/llpanelmaininventory.h
index 7aa0498e91c5e10c723280b79ec52ddf7b79923c..08caf68baf26a45530bea34a28d1b9b92de867bd 100644
--- a/indra/newview/llpanelmaininventory.h
+++ b/indra/newview/llpanelmaininventory.h
@@ -110,7 +110,7 @@ protected:
static BOOL incrementalFind(LLFolderViewItem* first_item, const char *find_text, BOOL backward);
void onFilterSelected();
- const std::string getFilterSubString();
+ const std::string& getFilterSubString();
void setFilterSubString(const std::string& string);
// menu callbacks
diff --git a/indra/newview/llpanelplaceprofile.cpp b/indra/newview/llpanelplaceprofile.cpp
index afe27e954f0bf933c40353e53a1e11c1c0dd94db..78a34273c1d86d566c7c3eaa2d63e28aaa70e50e 100644
--- a/indra/newview/llpanelplaceprofile.cpp
+++ b/indra/newview/llpanelplaceprofile.cpp
@@ -390,7 +390,7 @@ void LLPanelPlaceProfile::displaySelectedParcelInfo(LLParcel* parcel,
mEstateRatingIcon->setValue(icon_pg);
}
- std::string rating = LLViewerRegion::accessToString(sim_access);
+ const std::string& rating = LLViewerRegion::accessToString(sim_access);
mParcelRatingText->setText(rating);
mRegionRatingText->setText(rating);
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index bb5dcef685095702590a2fca6f1943d251e314b7..cb8aef11d958fc331ea9b5ea590712dc43d326ce 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -841,7 +841,7 @@ BOOL LLViewerRegion::canManageEstate() const
|| gAgent.getID() == getOwner();
}
-const std::string LLViewerRegion::getSimAccessString() const
+const std::string& LLViewerRegion::getSimAccessString() const
{
return accessToString(mSimAccess);
}
@@ -871,7 +871,7 @@ std::string LLViewerRegion::regionFlagsToString(U64 flags)
}
// static
-std::string LLViewerRegion::accessToString(U8 sim_access)
+const std::string& LLViewerRegion::accessToString(U8 sim_access)
{
switch (sim_access)
{
@@ -907,42 +907,51 @@ std::string LLViewerRegion::accessToString(U8 sim_access)
}
// static
-std::string LLViewerRegion::getAccessIcon(U8 sim_access)
+const std::string& LLViewerRegion::getAccessIcon(U8 sim_access)
{
+ static const std::string parcel_m_dark("Parcel_M_Dark");
+ static const std::string parcel_r_light("Parcel_R_Light");
+ static const std::string parcel_pg_light("Parcel_PG_Light");
+
switch(sim_access)
{
case SIM_ACCESS_MATURE:
- return "Parcel_M_Dark";
+ return parcel_m_dark;
case SIM_ACCESS_ADULT:
- return "Parcel_R_Light";
+ return parcel_r_light;
case SIM_ACCESS_PG:
- return "Parcel_PG_Light";
+ return parcel_pg_light;
case SIM_ACCESS_MIN:
default:
- return "";
+ return LLStringUtil::null;
}
}
// static
-std::string LLViewerRegion::accessToShortString(U8 sim_access)
+const std::string& LLViewerRegion::accessToShortString(U8 sim_access)
{
+ static const std::string ACCESS_PG_SHORT_STR("PG");
+ static const std::string ACCESS_MATURE_SHORT_STR("M");
+ static const std::string ACCESS_ADULT_SHORT_STR("A");
+ static const std::string ACCESS_MIN_SHORT_STR("U");
+
switch(sim_access) /* Flawfinder: ignore */
{
case SIM_ACCESS_PG:
- return "PG";
+ return ACCESS_PG_SHORT_STR;
case SIM_ACCESS_MATURE:
- return "M";
+ return ACCESS_MATURE_SHORT_STR;
case SIM_ACCESS_ADULT:
- return "A";
+ return ACCESS_ADULT_SHORT_STR;
case SIM_ACCESS_MIN:
default:
- return "U";
+ return ACCESS_MIN_SHORT_STR;
}
}
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 2f64370fe060077035c09c53922022cf8915b253..8ac4b00821a8fcd9f52e8f8fa8d96d4b792b90cb 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -192,7 +192,7 @@ public:
void setSimAccess(U8 sim_access) { mSimAccess = sim_access; }
U8 getSimAccess() const { return mSimAccess; }
- const std::string getSimAccessString() const;
+ const std::string& getSimAccessString() const;
// Homestead-related getters; there are no setters as nobody should be
// setting them other than the individual message handler which is a member
@@ -206,14 +206,14 @@ public:
static std::string regionFlagsToString(U64 flags);
// Returns translated version of "Mature", "PG", "Adult", etc.
- static std::string accessToString(U8 sim_access);
+ static const std::string& accessToString(U8 sim_access);
// Returns "M", "PG", "A" etc.
- static std::string accessToShortString(U8 sim_access);
+ static const std::string& accessToShortString(U8 sim_access);
static U8 shortStringToAccess(const std::string &sim_access);
// Return access icon name
- static std::string getAccessIcon(U8 sim_access);
+ static const std::string& getAccessIcon(U8 sim_access);
// helper function which just makes sure all interested parties
// can process the message.
@@ -361,8 +361,8 @@ public:
friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion ®ion);
/// implements LLCapabilityProvider
virtual std::string getDescription() const override;
- std::string getLegacyHttpUrl() const { return mLegacyHttpUrl; }
- std::string getViewerAssetUrl() const { return mViewerAssetUrl; }
+ const std::string& getLegacyHttpUrl() const { return mLegacyHttpUrl; }
+ const std::string& getViewerAssetUrl() const { return mViewerAssetUrl; }
U32 getNumOfVisibleGroups() const;
U32 getNumOfActiveCachedObjects() const;
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h
index fb8ca6cf7170c47c949b4f3d002316aa21bf8b48..e1cfc588df9a6fdb7e72d9b642b3277077b6f2bf 100644
--- a/indra/newview/llworldmap.h
+++ b/indra/newview/llworldmap.h
@@ -122,11 +122,11 @@ public:
// void setWaterHeight (F32 water_height) { mWaterHeight = water_height; }
// Accessors
- std::string getName() const { return mName; }
+ const std::string& getName() const { return mName; }
const std::string getFlagsString() const { return LLViewerRegion::regionFlagsToString(mRegionFlags); }
- const std::string getAccessString() const { return LLViewerRegion::accessToString((U8)mAccess); }
- const std::string getShortAccessString() const { return LLViewerRegion::accessToShortString(static_cast<U8>(mAccess)); } // <alchemy/>
- const std::string getAccessIcon() const { return LLViewerRegion::getAccessIcon(static_cast<U8>(mAccess)); }
+ const std::string& getAccessString() const { return LLViewerRegion::accessToString((U8)mAccess); }
+ const std::string& getShortAccessString() const { return LLViewerRegion::accessToShortString(static_cast<U8>(mAccess)); } // <alchemy/>
+ const std::string& getAccessIcon() const { return LLViewerRegion::getAccessIcon(static_cast<U8>(mAccess)); }
const S32 getAgentCount() const; // Compute the total agents count
LLPointer<LLViewerFetchedTexture> getLandForSaleImage(); // Get the overlay image, fetch it if necessary