From ae464867e6714816cd5bdaeecdd1d3c0a0817e58 Mon Sep 17 00:00:00 2001
From: Jon Wolk <jwolk@lindenlab.com>
Date: Tue, 15 Jul 2008 00:41:08 +0000
Subject: svn merge -r 90938:92097
 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge ->
 release.  This is for QAR-730: Combination merge of QAR-432 and QAR-601

---
 indra/newview/llstatusbar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llstatusbar.cpp')

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index a7314548ca..ac80f1b669 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -429,7 +429,7 @@ void LLStatusBar::refresh()
 		childSetVisible("restrictpush", FALSE);
 	}
 
-	BOOL have_voice = parcel && parcel->getVoiceEnabled(); 
+	BOOL have_voice = parcel && parcel->getParcelFlagAllowVoice(); 
 	if (have_voice)
 	{
 		childSetVisible("status_no_voice", FALSE);
-- 
cgit v1.3