diff options
author | prep <prep@lindenlab.com> | 2012-06-18 12:27:46 -0400 |
---|---|---|
committer | prep <prep@lindenlab.com> | 2012-06-18 12:27:46 -0400 |
commit | 329b98528ea4fdd34baaa225e4aa46ea8ad5bfe1 (patch) | |
tree | 1e4d8488913eec8eebbc6ab4579ad405d3124c20 /indra/newview/llfloaterpathfindinglinksets.cpp | |
parent | 583855f3e6ba45915c0031396ed90054a18c4c4d (diff) | |
parent | 501127e4649cf6cdb8e1c31d66d8d24e20fe0631 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterpathfindinglinksets.cpp')
-rw-r--r-- | indra/newview/llfloaterpathfindinglinksets.cpp | 4 |
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(); |