diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-09-27 17:54:52 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-09-27 17:54:52 -0700 |
commit | a4b223248eac077c7d8e00c5fbb9f5fb067cc9bd (patch) | |
tree | 760a282276c5bf6e4095b0944b1a08a3bfd32d87 /indra/newview/llpanelme.cpp | |
parent | 7fc48fb1259d3dbceed5248d8ccda39048d6ba8d (diff) | |
parent | e6688f993f82d2683e3eadce96c893959c94be2d (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelme.cpp')
-rw-r--r-- | indra/newview/llpanelme.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelme.cpp b/indra/newview/llpanelme.cpp index b76a6bba2e..a4a63cdc1c 100644 --- a/indra/newview/llpanelme.cpp +++ b/indra/newview/llpanelme.cpp @@ -170,7 +170,7 @@ void LLPanelMe::onCancelClicked() LLPanelMyProfileEdit::LLPanelMyProfileEdit() : LLPanelMyProfile() { - LLUICtrlFactory::getInstance()->buildPanel(this, "panel_edit_profile.xml"); + buildFromFile( "panel_edit_profile.xml"); setAvatarId(gAgent.getID()); } |