diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 765e0a18e67822f7870d49086a2b42d04ce7f6c7..dd92883270e8dfba856cb5542d747910a941445a 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -385,7 +385,7 @@ void LLMenuItemGL::buildDrawLabel( void ) mDrawAccelLabel.clear(); std::string st = mDrawAccelLabel.getString(); appendAcceleratorString( st ); - mDrawAccelLabel = st; + mDrawAccelLabel = std::move(st); } void LLMenuItemGL::onCommit( void ) diff --git a/indra/llui/llmenugl.h b/indra/llui/llmenugl.h index 3e78b69184fc13f72ae91b8de458bc3cc0e9f392..c76a387aaa47fa9e069c9f5a7a4068e3af301f66 100644 --- a/indra/llui/llmenugl.h +++ b/indra/llui/llmenugl.h @@ -123,7 +123,7 @@ class LLMenuItemGL: public LLUICtrl, public ll::ui::SearchableControl // change the label void setLabel(LLStringExplicit label ) { mLabel = std::move(label); } - std::string getLabel( void ) const { return mLabel.getString(); } + const std::string& getLabel() const { return mLabel.getString(); } virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ); // Get the parent menu for this item diff --git a/indra/llui/llscrolllistcolumn.cpp b/indra/llui/llscrolllistcolumn.cpp index cc9ff7a487d60c4dc8ee28d4778ea10b9ccb5f30..362c14bcff1d3d3bf7297bc63a8e41487ee8425a 100644 --- a/indra/llui/llscrolllistcolumn.cpp +++ b/indra/llui/llscrolllistcolumn.cpp @@ -73,7 +73,7 @@ LLScrollColumnHeader::~LLScrollColumnHeader() void LLScrollColumnHeader::draw() { - std::string sort_column = mColumn->mParentCtrl->getSortColumnName(); + const std::string& sort_column = mColumn->mParentCtrl->getSortColumnName(); BOOL draw_arrow = !mColumn->mLabel.empty() && mColumn->mParentCtrl->isSorted() // check for indirect sorting column as well as column's sorting name diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 4c33c5e0995f93291169d0057e20d2327d211db9..d519908061e73ae45e44be464a276a62f2cabf4a 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -2988,12 +2988,14 @@ void LLScrollListCtrl::onClickColumn(void *userdata) } } -std::string LLScrollListCtrl::getSortColumnName() +const std::string& LLScrollListCtrl::getSortColumnName() { LLScrollListColumn* column = mSortColumns.empty() ? NULL : mColumnsIndexed[mSortColumns.back().first]; - if (column) return column->mName; - else return ""; + if (column) + return column->mName; + else + return LLStringUtil::null; } BOOL LLScrollListCtrl::hasSortOrder() const diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h index da482053f6dfbed21ee0d522092768c2fcda9b87..a1b017b535a7453e33fd20dc092c92563dd195ba 100644 --- a/indra/llui/llscrolllistctrl.h +++ b/indra/llui/llscrolllistctrl.h @@ -393,7 +393,7 @@ class LLScrollListCtrl : public LLUICtrl, public LLEditMenuHandler, void updateStaticColumnWidth(LLScrollListColumn* col, S32 new_width); S32 getTotalStaticColumnWidth() { return mTotalStaticColumnWidth; } - std::string getSortColumnName(); + const std::string& getSortColumnName(); BOOL getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; } BOOL hasSortOrder() const; void clearSortOrder(); diff --git a/indra/llui/llscrolllistitem.cpp b/indra/llui/llscrolllistitem.cpp index 51c615dd0037e23f0f5620ee07196c8470ce95f2..42f0e8a4b02e1fb5f1dd1380e19dda8e4af9ca72 100644 --- a/indra/llui/llscrolllistitem.cpp +++ b/indra/llui/llscrolllistitem.cpp @@ -148,7 +148,7 @@ void LLScrollListItem::draw(const LLRect& rect, const LLColor4& fg_color, const { // draw background rect gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); - LLRect bg_rect = rect; + const LLRect& bg_rect = rect; if (mSelectedIndex < 0 && getSelected()) { // Whole item is highlighted/selected diff --git a/indra/newview/alfloaterregiontracker.cpp b/indra/newview/alfloaterregiontracker.cpp index cb70e849d4b1686999fb70df832a822c7f774f36..b33587e2bb72efab9a53844aa6b0ce93b6764818 100644 --- a/indra/newview/alfloaterregiontracker.cpp +++ b/indra/newview/alfloaterregiontracker.cpp @@ -111,7 +111,7 @@ void ALFloaterRegionTracker::refresh() const std::string& saved_selected_value = mRegionScrollList->getSelectedValue().asString(); S32 saved_scroll_pos = mRegionScrollList->getScrollPos(); - auto sort_column_name = mRegionScrollList->getSortColumnName(); + const auto& sort_column_name = mRegionScrollList->getSortColumnName(); auto sort_asending = mRegionScrollList->getSortAscending(); mRegionScrollList->deleteAllItems();