aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelavatar.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:29 -0500
committerJacek Antonelli2008-08-15 23:45:29 -0500
commit7bdb4845afdd157f95281293803567090e3f992a (patch)
treefbcada1c227d7407f9f37ccba360bfe6326d9c5e /linden/indra/newview/llpanelavatar.cpp
parentSecond Life viewer sources 1.19.0.0 (diff)
downloadmeta-impy-7bdb4845afdd157f95281293803567090e3f992a.zip
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.gz
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.bz2
meta-impy-7bdb4845afdd157f95281293803567090e3f992a.tar.xz
Second Life viewer sources 1.19.0.2
Diffstat (limited to 'linden/indra/newview/llpanelavatar.cpp')
-rw-r--r--linden/indra/newview/llpanelavatar.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index dd4d6cf..664c9a6 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -575,7 +575,8 @@ LLPanelAvatarWeb::~LLPanelAvatarWeb()
575void LLPanelAvatarWeb::enableControls(BOOL self) 575void LLPanelAvatarWeb::enableControls(BOOL self)
576{ 576{
577 childSetEnabled("url_edit",self); 577 childSetEnabled("url_edit",self);
578 childSetVisible("status_text",!self); 578 childSetVisible("status_text",!self && !mURL.empty());
579 childSetText("status_text", LLString::null);
579} 580}
580 581
581void LLPanelAvatarWeb::setWebURL(std::string url) 582void LLPanelAvatarWeb::setWebURL(std::string url)
@@ -605,6 +606,9 @@ void LLPanelAvatarWeb::setWebURL(std::string url)
605 { 606 {
606 childSetVisible("profile_html",false); 607 childSetVisible("profile_html",false);
607 } 608 }
609
610 BOOL own_avatar = (getPanelAvatar()->getAvatarID() == gAgent.getID() );
611 childSetVisible("status_text",!own_avatar && !mURL.empty());
608 612
609#if !LL_LIBXUL_ENABLED 613#if !LL_LIBXUL_ENABLED
610 childSetVisible("load",false); 614 childSetVisible("load",false);