1 files changed, 8 insertions, 5 deletions

diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index 8d2c2ac..2220d59 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -72,7 +72,7 @@ public:
         virtual ~LLVoiceClientStatusObserver() { }
         virtual void onChange(EStatusType status, const std::string &channelURI, bool proximal) = 0;
 
-        static const char *status2string(EStatusType inStatus);
+        static std::string status2string(EStatusType inStatus);
 };
 
 class LLVoiceClient: public LLSingleton<LLVoiceClient>
@@ -99,7 +99,9 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
                         serviceTypeC            // one-to-one and small group chat
                 };
                 static F32 OVERDRIVEN_POWER_LEVEL;
-                                
+
+                void updateSettings(); // call after loading settings and whenever they change
+        
                 /////////////////////////////
                 // session control messages
                 void connect();
@@ -188,6 +190,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
                 
                 /////////////////////////////
                 // Sending updates of current state
+static  void updatePosition(void);
                 void setCameraPosition(const LLVector3d &position, const LLVector3 &velocity, const LLMatrix3 &rot);
                 void setAvatarPosition(const LLVector3d &position, const LLVector3 &velocity, const LLMatrix3 &rot);
                 bool channelFromRegion(LLViewerRegion *region, std::string &name);
@@ -225,7 +228,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
                 BOOL getPTTPressed(const LLUUID& id);                   // This is the inverse of the "locally muted" property.
                 BOOL getOnMuteList(const LLUUID& id);
                 F32 getUserVolume(const LLUUID& id);
-                LLString getDisplayName(const LLUUID& id);
+                std::string getDisplayName(const LLUUID& id);
                 
                 // MBW -- XXX -- Not sure how to get this data out of the TVC
                 BOOL getUsingPTT(const LLUUID& id);
@@ -272,7 +275,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
                 void addStatusObserver(LLVoiceClientStatusObserver* observer);
                 void removeStatusObserver(LLVoiceClientStatusObserver* observer);
                 
-                static void onAvatarNameLookup(const LLUUID& id, const char* first, const char* last, BOOL is_group, void* user_data);
+//              static void onAvatarNameLookup(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group, void* user_data);
                 typedef std::vector<std::string> deviceList;
 
                 deviceList *getCaptureDevices();
@@ -355,7 +358,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
                 
                 void setState(state inState);
                 state getState(void)  { return mState; };
-                static const char *state2string(state inState);
+                static std::string state2string(state inState);
                 
                 void stateMachine();
                 static void idle(void *user_data);