summaryrefslogtreecommitdiff
path: root/indra/newview/llnamelistctrl.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
committerDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
commit9ea2d90a0dd9ca9ab76583187354533011ef3fcb (patch)
tree93be8f1dd703cd87083cf871c1948671e0a8cb97 /indra/newview/llnamelistctrl.cpp
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
parentf62d04d4256e3ebb7ecf64ea370099c8795e8581 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llnamelistctrl.cpp')
-rwxr-xr-xindra/newview/llnamelistctrl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp
index 7f396b7b7e..7ddd04fed0 100755
--- a/indra/newview/llnamelistctrl.cpp
+++ b/indra/newview/llnamelistctrl.cpp
@@ -416,9 +416,9 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
}
-void LLNameListCtrl::updateColumns()
+void LLNameListCtrl::updateColumns(bool force_update)
{
- LLScrollListCtrl::updateColumns();
+ LLScrollListCtrl::updateColumns(force_update);
if (!mNameColumn.empty())
{