From 5b4b2b1078149bb86f3105e467fea5499015b096 Mon Sep 17 00:00:00 2001
From: Inusaito Sayori <Inusaito@gmail.com>
Date: Thu, 8 Aug 2013 21:52:36 -0400
Subject: [PATCH] Fix the load button on web tab of profiles not working,
 thanks to goldlatias for pointing this out.

---
 indra/newview/llpanelavatar.cpp                        | 4 ++--
 indra/newview/skins/default/xui/en-us/panel_avatar.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 6f5dcb6af..f1351cc57 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -560,9 +560,9 @@ BOOL LLPanelAvatarWeb::postBuild(void)
 	url_edit->setKeystrokeCallback(boost::bind(&LLPanelAvatarWeb::onURLKeystroke,this,_1));
 	url_edit->setCommitCallback(boost::bind(&LLPanelAvatarWeb::onCommitURL,this,_2));
 
-	childSetAction("web_profile_help",onClickWebProfileHelp,this);
+	getChild<LLUICtrl>("load")->setCommitCallback(boost::bind(&LLPanelAvatarWeb::onCommitLoad, this, _2));
 
-	childSetControlName("auto_load","AutoLoadWebProfiles");
+	childSetAction("web_profile_help",onClickWebProfileHelp,this);
 
 	mWebBrowser = getChild<LLMediaCtrl>("profile_html");
 	mWebBrowser->addObserver(this);
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index c4d6f0f97..ef300c2f7 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -209,7 +209,7 @@
 			     mouse_opaque="true" name="web_profile_help" width="18" />
 			<check_box bottom_delta="0" follows="right|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Automatically load web profiles"
-			     left_delta="90" mouse_opaque="true" name="auto_load"
+			     left_delta="90" mouse_opaque="true" name="auto_load" control_name="AutoLoadWebProfiles"
 			     tool_tip="Automatically load ALL profile webpages without asking first."
 			     width="127" />
 			<web_browser border_visible="false" bottom="-444" follows="top|left|right" height="400"