summaryrefslogtreecommitdiff
path: root/indra/newview/llnamelistctrl.cpp
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-08-19 16:12:07 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-08-19 16:12:07 -0600
commit1616b73ef30bcb3e99be68fb7ccc05f0be78ddf6 (patch)
treee22c94948ed8d8c7f35422fc064172ea3662b264 /indra/newview/llnamelistctrl.cpp
parentea45b8acd25785bd2789c2c1928e223c9a8e2fbd (diff)
parentd8c02bf06250015b8cb0bcc9c0d8445cfb6acf1c (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
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 80d3b2ee7b..b2a3a9f645 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())
{