summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.h
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-02 14:17:24 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-02 14:17:24 -0500
commit0a7ac2fc170d0a2144eca924f5a0b8ffa8363ce4 (patch)
tree4b224e6b5e55d37690b4639e05b893cd04a4058e /indra/newview/llvoiceclient.h
parent86b1ee7703bb57c6b1e1c068cda02bfb9ed0721e (diff)
parent3783852444825edf420e6109927df21fd004c3e7 (diff)
merge
Diffstat (limited to 'indra/newview/llvoiceclient.h')
-rw-r--r--indra/newview/llvoiceclient.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index bddd18dee8..9df96d9a52 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -204,6 +204,9 @@ static void updatePosition(void);
void keyDown(KEY key, MASK mask);
void keyUp(KEY key, MASK mask);
void middleMouseState(bool down);
+
+ // Return the version of the Vivox library
+ std::string getAPIVersion() const { return mAPIVersion; }
/////////////////////////////
// Accessors for data related to nearby speakers
@@ -739,6 +742,8 @@ static std::string nameFromsipURI(const std::string &uri);
BOOL mLipSyncEnabled;
+ std::string mAPIVersion;
+
typedef std::set<LLVoiceClientParticipantObserver*> observer_set_t;
observer_set_t mParticipantObservers;