summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelavatar.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-02-25 18:24:07 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-02-25 18:24:07 -0800
commit9b05fecbf6b3d65dae5a010fc35821dc116a44d0 (patch)
tree9c0df85bb3a8b5c4e58655179e1b29ee31594cfc /indra/newview/llpanelavatar.cpp
parent5ed6e0720af1b6cdf1a983e2c040eeb5d8ae33ba (diff)
parentdb4e46e93d06c03520cb7c781b8e41b6d374414d (diff)
automated merge from trunk
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
-rw-r--r--indra/newview/llpanelavatar.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index dc40ed9c6a..03d3c11b76 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -635,6 +635,9 @@ void LLPanelAvatarProfile::fillCommonData(const LLAvatarData* avatar_data)
childSetValue("2nd_life_pic", avatar_data->image_id);
childSetValue("real_world_pic", avatar_data->fl_image_id);
childSetValue("homepage_edit", avatar_data->profile_url);
+
+ // Hide home page textbox if no page was set to fix "homepage URL appears clickable without URL - EXT-4734"
+ childSetVisible("homepage_edit", !avatar_data->profile_url.empty());
}
void LLPanelAvatarProfile::fillPartnerData(const LLAvatarData* avatar_data)