summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpathfindinglinksets.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-06-15 14:05:06 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-06-15 14:05:06 -0700
commita69d0f84fd6b63b283c4b49c2226ca05e368e6b9 (patch)
tree4403afe9307f1ebf2bbd948f585cc71ef72ad305 /indra/newview/llfloaterpathfindinglinksets.cpp
parentc17746f9a0d3854c5db93e3a908437d664890759 (diff)
parente78266e9378bdd19ea4a8f7833cf39e59d2faecc (diff)
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-premium-wilderness.
Diffstat (limited to 'indra/newview/llfloaterpathfindinglinksets.cpp')
-rw-r--r--indra/newview/llfloaterpathfindinglinksets.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpathfindinglinksets.cpp b/indra/newview/llfloaterpathfindinglinksets.cpp
index 8488ee1aa3..a7b856b271 100644
--- a/indra/newview/llfloaterpathfindinglinksets.cpp
+++ b/indra/newview/llfloaterpathfindinglinksets.cpp
@@ -250,9 +250,9 @@ LLSD LLFloaterPathfindingLinksets::convertObjectsIntoScrollListData(const LLPath
return scrollListData;
}
-void LLFloaterPathfindingLinksets::updateControls()
+void LLFloaterPathfindingLinksets::updateControlsOnScrollListChange()
{
- LLFloaterPathfindingObjects::updateControls();
+ LLFloaterPathfindingObjects::updateControlsOnScrollListChange();
updateEditFieldValues();
updateStateOnEditFields();
updateStateOnEditLinksetUse();