Fixup some logic relating to teleporting and new regions

1 files changed, 9 insertions, 2 deletions

diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 02f73cde7a..3b1b3bd0c4 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -480,7 +480,6 @@ public:
 						const LLUUID &agentID);
 
 	void onRegionChanged();
-	void onSimulatorFeaturesReceived(const LLUUID &region_id);
 
 	void addObserver(LLVoiceClientStatusObserver* observer);
 	void removeObserver(LLVoiceClientStatusObserver* observer);
@@ -500,12 +499,20 @@ public:
 	// Returns NULL if voice effects are not supported, or not enabled.
 	LLVoiceEffectInterface* getVoiceEffectInterface() const;
 	//@}
-private:
+
+    void handleSimulatorFeaturesReceived(const LLSD &simulatorFeatures);
+
+  private:
+
 	void init(LLPumpIO *pump);
 
 protected:
+
 	LLVoiceModuleInterface* mSpatialVoiceModule;
     LLVoiceModuleInterface* mNonSpatialVoiceModule;
+    LLSD                    mSpatialCredentials;  // used to store spatial credentials for vivox
+	                                              // so they're available when the region voice
+	                                              // server is retrieved.
 	LLPumpIO *m_servicePump;
 
     boost::signals2::connection  mSimulatorFeaturesReceivedSlot;