summaryrefslogtreecommitdiff
path: root/indra/newview/llnamelistctrl.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-19 15:14:23 -0400
committerOz Linden <oz@lindenlab.com>2013-08-19 15:14:23 -0400
commit731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (patch)
tree142060ca39c7e495d05edf7e0359a15716840705 /indra/newview/llnamelistctrl.cpp
parent53eff025bc205e3127da4dc0c3df3cb406eb1153 (diff)
parent171089207b528ab80a954292c127ba77254ee927 (diff)
merge changes for 3.6.3-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())
{