summaryrefslogtreecommitdiff
path: root/indra/newview/llscrollingpanelparam.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-15 16:40:24 -0400
committerOz Linden <oz@lindenlab.com>2010-10-15 16:40:24 -0400
commit18321756297bd9b04a4204abe4fbb0e3e8112186 (patch)
tree01e58c48ac8be93161d4a7002232ea7974637a39 /indra/newview/llscrollingpanelparam.cpp
parentcc902e3d24c88bd49c591e81506875c5e3782b08 (diff)
parentdd69516213fdf20cbc254214e651c4df26afbff7 (diff)
pull fix for STORM-279
Diffstat (limited to 'indra/newview/llscrollingpanelparam.cpp')
-rw-r--r--indra/newview/llscrollingpanelparam.cpp2
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");