summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llvoiceclient.h')
-rw-r--r--indra/newview/llvoiceclient.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 46dd325e21..02f73cde7a 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -96,10 +96,10 @@ public:
struct LLVoiceVersionInfo
{
std::string voiceServerType;
- std::string internalVoiceServerType;
- int majorVersion;
- int minorVersion;
- std::string serverVersion;
+ std::string internalVoiceServerType;
+ int majorVersion;
+ int minorVersion;
+ std::string serverVersion;
std::string mBuildVersion;
};
@@ -205,7 +205,7 @@ public:
virtual bool inProximalChannel()=0;
virtual void setNonSpatialChannel(const LLSD& channelInfo,
- bool notify_on_first_join,
+ bool notify_on_first_join,
bool hangup_on_last_leave)=0;
virtual bool setSpatialChannel(const LLSD& channelInfo)=0;
@@ -474,13 +474,13 @@ public:
//@}
void setSpatialVoiceModule(const std::string& voice_server_type);
- void setNonSpatialVoiceModule(const std::string &voice_server_type);
+ void setNonSpatialVoiceModule(const std::string &voice_server_type);
void userAuthorized(const std::string& user_id,
const LLUUID &agentID);
- void onRegionChanged();
- void onSimulatorFeaturesReceived(const LLUUID &region_id);
+ void onRegionChanged();
+ void onSimulatorFeaturesReceived(const LLUUID &region_id);
void addObserver(LLVoiceClientStatusObserver* observer);
void removeObserver(LLVoiceClientStatusObserver* observer);