diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:08:54 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-09-10 03:08:54 +0000 |
commit | 44f294d484185ef3cb9f51e5cba6a3ee269b96dc (patch) | |
tree | 10405a76d776f22e2800abae93b04fd2aec6dddb /indra/newview/llpanelavatar.cpp | |
parent | bbf497469c4d71d5308421f1ef06d0a2098772c8 (diff) |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3
* Bugs: EXT-848 EXT-865
* New Dev: EXT-790 EXT-822
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
-rw-r--r-- | indra/newview/llpanelavatar.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index ba383a8dee..e0b7aeb77e 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -556,8 +556,6 @@ BOOL LLPanelAvatarMeProfile::postBuild() childSetCommitCallback("status_combo", boost::bind(&LLPanelAvatarMeProfile::onStatusChanged, this), NULL); childSetCommitCallback("status_me_message_text", boost::bind(&LLPanelAvatarMeProfile::onStatusMessageChanged, this), NULL); - childSetTextArg("partner_edit_link", "[URL]", getString("partner_edit_link_url")); - resetControls(); resetData(); |