diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-18 17:40:04 -0400 |
| commit | 53ce47fc1c2a713c6d7dd7fd9f98e50de727b974 (patch) | |
| tree | fcc220f37f0de56d63c5f501e7c577463106eb69 /indra/newview/llagent.h | |
| parent | f36cf6f1bad7e239011ab3ad40dca8002f42083c (diff) | |
| parent | 395a29717026221255d8bed57098afa52c49bff9 (diff) | |
merge changes for STORM-1654
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 5e23ced424..0f7ed9ce68 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 pressMicrophone(const LLSD& name); + static void releaseMicrophone(const LLSD& name); + static bool isMicrophoneOn(const LLSD& sdname); + +private: + bool mVoiceConnected; + //-------------------------------------------------------------------- // Chat //-------------------------------------------------------------------- @@ -575,6 +589,15 @@ private: ** ** *******************************************************************************/ + // Build +public: + bool canEditParcel() const { return mCanEditParcel; } +private: + bool mCanEditParcel; + + static bool isActionAllowed(const LLSD& sdname); + static void parcelChangedCallback(); + /******************************************************************************** ** ** ** ACCESS |