summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelavatar.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-01-28 12:48:48 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2010-01-28 12:48:48 -0800
commit5a34cf1af83314774f11b0d24279794794bc9147 (patch)
tree720b576c642646f27d3e5b4f7ccba91b9e708371 /indra/newview/llpanelavatar.cpp
parent2795661869e3dbbfe1e6becec1d6bb3635eafd3b (diff)
parentfc8e185fafcfea1ead8b9c064ed38d5ac65f81b6 (diff)
Merge from viewer2 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 fe5b20813a..48dd5513bd 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)