merge release@83343 skinning-1-merge@83714 -> release

QAR-424

1 files changed, 6 insertions, 6 deletions

diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index fd85ac1bc1..5703a8fdbc 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -57,9 +57,9 @@ void init_audio()
 	lpos_global_f.setVec(lpos_global);
 					
 	gAudiop->setListener(lpos_global_f,
-						  LLVector3::zero,	// gCamera->getVelocity(),    // !!! BUG need to replace this with smoothed velocity!
-						  gCamera->getUpAxis(),
-						  gCamera->getAtAxis());
+						  LLVector3::zero,	// LLViewerCamera::getInstance()->getVelocity(),    // !!! BUG need to replace this with smoothed velocity!
+						  LLViewerCamera::getInstance()->getUpAxis(),
+						  LLViewerCamera::getInstance()->getAtAxis());
 
 // load up our initial set of sounds we'll want so they're in memory and ready to be played
 
@@ -188,11 +188,11 @@ void audio_update_listener()
 		lpos_global_f.setVec(lpos_global);
 	
 		gAudiop->setListener(lpos_global_f,
-							 // gCameraVelocitySmoothed, 
+							 // LLViewerCamera::getInstance()VelocitySmoothed, 
 							 // LLVector3::zero,	
 							 gAgent.getVelocity(),    // !!! *TODO: need to replace this with smoothed velocity!
-							 gCamera->getUpAxis(),
-							 gCamera->getAtAxis());
+							 LLViewerCamera::getInstance()->getUpAxis(),
+							 LLViewerCamera::getInstance()->getAtAxis());
 	}
 }