summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.h
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-11-23 14:33:05 +0200
committerVadim ProductEngine <vsavchuk@productengine.com>2011-11-23 14:33:05 +0200
commit710d2fd0f34484495fa494eefa2ffc1cdb3087e3 (patch)
treecfd6cc10b61e906b9b686def6f354033e77b8aaa /indra/newview/llagent.h
parentd3773b991a22e2f13b37bc50fafb4477b5b940b1 (diff)
EXP-1581 FIXED Added more floaters to the viewer menu.
It is also now possible to toggle microphone via the menu. See JIRA for the full list of changes.
Diffstat (limited to 'indra/newview/llagent.h')
-rw-r--r--indra/newview/llagent.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index 0f7ed9ce68..740770bbdf 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -292,7 +292,9 @@ public:
static void pressMicrophone(const LLSD& name);
static void releaseMicrophone(const LLSD& name);
+ static void toggleMicrophone(const LLSD& name);
static bool isMicrophoneOn(const LLSD& sdname);
+ static bool isActionAllowed(const LLSD& sdname);
private:
bool mVoiceConnected;
@@ -595,7 +597,6 @@ public:
private:
bool mCanEditParcel;
- static bool isActionAllowed(const LLSD& sdname);
static void parcelChangedCallback();
/********************************************************************************