diff options
| author | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
| commit | abe758d45fa3dd3524a4c7a9667e4f02c3de8eac (patch) | |
| tree | 7ac140c51c22a42c693b0930898e0996a807ecb8 /indra/newview/llpanelteleporthistory.cpp | |
| parent | 264b549bcb991f4cdd6889f06b8f7fbe8740e32a (diff) | |
| parent | b124d45b4ef714acfe629af554768950dcdd5f2c (diff) | |
merge
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() |