diff options
author | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:40:24 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-10-15 16:40:24 -0400 |
commit | 18321756297bd9b04a4204abe4fbb0e3e8112186 (patch) | |
tree | 01e58c48ac8be93161d4a7002232ea7974637a39 /indra/newview/llpanelteleporthistory.cpp | |
parent | cc902e3d24c88bd49c591e81506875c5e3782b08 (diff) | |
parent | dd69516213fdf20cbc254214e651c4df26afbff7 (diff) |
pull fix for STORM-279
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
-rw-r--r-- | indra/newview/llpanelteleporthistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp index a7cbf52290..9b8167b15a 100644 --- a/indra/newview/llpanelteleporthistory.cpp +++ b/indra/newview/llpanelteleporthistory.cpp @@ -126,7 +126,7 @@ LLTeleportHistoryFlatItem::LLTeleportHistoryFlatItem(S32 index, LLTeleportHistor mRegionName(region_name), mHighlight(hl) { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_teleport_history_item.xml"); + buildFromFile( "panel_teleport_history_item.xml"); } LLTeleportHistoryFlatItem::~LLTeleportHistoryFlatItem() @@ -377,7 +377,7 @@ LLTeleportHistoryPanel::LLTeleportHistoryPanel() mLastSelectedFlatlList(NULL), mLastSelectedItemIndex(-1) { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_teleport_history.xml"); + buildFromFile( "panel_teleport_history.xml"); } LLTeleportHistoryPanel::~LLTeleportHistoryPanel() |