summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.h
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-11 09:10:33 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-11 09:10:33 -0700
commit05b31ff3b235bdcf7e9bb0fe1ff701c006e8ec66 (patch)
tree4fd5e083694142609bd099cf71e092f9c7457e9f /indra/newview/llagent.h
parent0620e6a79149e455744131703e8bdb74864b69be (diff)
parentc845925eebb5cad3049ee0f3b1d0adea3e3a46b5 (diff)
Merge
Diffstat (limited to 'indra/newview/llagent.h')
-rw-r--r--indra/newview/llagent.h16
1 files changed, 15 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 1775a0235c..0355e68b6e 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -282,7 +282,21 @@ public:
static void toggleFlying();
static bool enableFlying();
BOOL canFly(); // Does this parcel allow you to fly?
-
+
+ //--------------------------------------------------------------------
+ // Voice
+ //--------------------------------------------------------------------
+public:
+ bool isVoiceConnected() const { return mVoiceConnected; }
+ void setVoiceConnected(const bool b) { mVoiceConnected = b; }
+
+ static void toggleMicrophone(const LLSD& name);
+ static bool isMicrophoneOn(const LLSD& sdname);
+
+private:
+ bool mVoiceConnected;
+ bool mMicrophoneOn;
+
//--------------------------------------------------------------------
// Chat
//--------------------------------------------------------------------