diff options
author | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
commit | 58ac85223e976556b060ca0ff345f1a96d8f7848 (patch) | |
tree | 1e8901e1a47304829d67e5e71b178a5f47142c7c /indra/newview/llscrollingpanelparam.cpp | |
parent | 92195c479f597538a55dfa8b2e02c1b4908a2259 (diff) | |
parent | fbcbfb88059b0d669592407205dd4167257a2395 (diff) |
merge
Diffstat (limited to 'indra/newview/llscrollingpanelparam.cpp')
-rw-r--r-- | indra/newview/llscrollingpanelparam.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp index 2d8c9b0fec..05b273cd29 100644 --- a/indra/newview/llscrollingpanelparam.cpp +++ b/indra/newview/llscrollingpanelparam.cpp @@ -56,7 +56,7 @@ LLScrollingPanelParam::LLScrollingPanelParam( const LLPanel::Params& panel_param mAllowModify(allow_modify), mWearable(wearable) { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_scrolling_param.xml"); + buildFromFile( "panel_scrolling_param.xml"); // *HACK To avoid hard coding texture position, lets use border's position for texture. LLViewBorder* left_border = getChild<LLViewBorder>("left_border"); |