From 73340eb0edfbb0e39c9c78656d041f5b8b1fdc3a Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Mon, 8 Jun 2009 01:46:10 -0700 Subject: Fixed VC++ warning C4305: '=' : truncation from 'double' to 'float' for mVolume --- ChangeLog.txt | 6 +++++- linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 404b9fd..75fe2af 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -3,7 +3,7 @@ * Updated Imprudence to be based on SL 1.22.11. - McCabe Maxsted + McCabe Maxsted * Fixed CopyWinLibs.CMake errors. @@ -15,6 +15,10 @@ modified: linden/indra/llaudio/audioengine_openal.cpp modified: linden/indra/llaudio/audioengine_openal.h + + * Fixed VC++ warning C4305: '=' : truncation from 'double' to 'float' for mVolume. + + modified: linden/indra/llmedia/llmediaimplgstreamer.cpp =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp index e83caf7..d1bab29 100644 --- a/linden/indra/llmedia/llmediaimplgstreamer.cpp +++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp @@ -97,8 +97,6 @@ LLMediaImplGStreamer () : LL_DEBUGS("MediaManager") << "constructing media..." << LL_ENDL; mVolume = -1.0; // XXX Hack to make the vould change happend first time - mVolume = 0.1234567; // minor hack to force an initial volume update - setMediaDepth(4); // Create a pumpable main-loop for this media -- cgit v1.1