From 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c Mon Sep 17 00:00:00 2001
From: Jon Wolk <jwolk@lindenlab.com>
Date: Wed, 19 Dec 2007 00:56:59 +0000
Subject: svn merge -r 75354:76103
 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 ->
 release.  Finished product of QAR-134

---
 indra/newview/llviewerregion.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llviewerregion.h')

diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index a0953e561e..e42c0015df 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -109,6 +109,8 @@ public:
 	void setWaterHeight(F32 water_level);
 	F32 getWaterHeight() const;
 
+	BOOL isVoiceEnabled() const;
+
 	void setBillableFactor(F32 billable_factor) { mBillableFactor = billable_factor; }
 	F32 getBillableFactor() 		const 	{ return mBillableFactor; }
 
-- 
cgit v1.2.3