diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2009-12-14 11:44:48 -0600 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2009-12-14 11:44:48 -0600 |
| commit | de38b58f37d6c7dadd4a5f15be519cb0bb230fc7 (patch) | |
| tree | fdfe34a8be0e2086c1e9407931af85f5f8c2fc39 /indra/newview/llpanelavatar.cpp | |
| parent | fadfa09e6d3bbff9ebae0aabeacf26a83aae4ad7 (diff) | |
| parent | a9e409c7071ba74f01158aa7b876a1ad60161fc4 (diff) | |
Merging in latest viewer 2
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()); } ////////////////////////////////////////////////////////////////////////// |