diff options
author | callum <none@none> | 2009-12-14 14:10:16 -0800 |
---|---|---|
committer | callum <none@none> | 2009-12-14 14:10:16 -0800 |
commit | 180daf3ab83ff9a83200c1952c0f09d20cfcb992 (patch) | |
tree | 4591d743023244614678022269d80ef6d8097f63 /indra/newview/llpanelavatar.cpp | |
parent | 894a5006b3e5b4c725060443dab34491b0da3a4d (diff) | |
parent | 5b6e4577ae6073650d78e1181ca5b60c527a7ae7 (diff) |
Merge with Tip
Diffstat (limited to 'indra/newview/llpanelavatar.cpp')
-rw-r--r-- | indra/newview/llpanelavatar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index eb9cb10d56..b9f422ca6f 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -51,6 +51,7 @@ #include "llfloaterworldmap.h" #include "llfloaterreg.h" #include "llnotificationsutil.h" +#include "llvoiceclient.h" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLDropTarget @@ -395,6 +396,7 @@ void LLPanelProfileTab::updateButtons() && gAgent.isGodlike() || is_agent_mappable(getAvatarId()); childSetEnabled("show_on_map_btn", enable_map_btn); + childSetEnabled("call", LLVoiceClient::voiceEnabled()); } ////////////////////////////////////////////////////////////////////////// |