From 4c6fc784a685445d22ce7b370d6e376da918e423 Mon Sep 17 00:00:00 2001
From: "Graham Madarasz (Graham)" <graham@lindenlab.com>
Date: Mon, 4 Feb 2013 14:04:22 -0800
Subject: Point autobuild at newer fmodex builds and fix warning being treated
 as error in llaudioengine_fmodex.cpp

---
 autobuild.xml                          | 11 +++++------
 indra/llaudio/llaudioengine_fmodex.cpp |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index de4c28c584..62fa341a06 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -498,9 +498,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-	      <string>39817c0f0961a8b82558d9cef1c759bd</string>
+	      <string>6ce79e860182dceb52bceea943b3cc2c</string>
               <key>url</key>
-	      <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/269940/arch/Darwin/installer/fmodex-4.44-darwin-20130204.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/269947/arch/Darwin/installer/fmodex-4.44-darwin-20130204.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -510,7 +510,7 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>6edb8c10d6cada8af476c27659dcfb92</string>
+	      <string>33e494c9a7044c99bcd6ce2995316659</string>
               <key>url</key>
               <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/269934/arch/Linux/installer/fmodex-4.44-linux-20130204.tar.bz2</string>
             </map>
@@ -522,10 +522,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-
-	      <string>a1713cb64a792b0ad44cf640e862dc33</string>
+	      <string>3ae0fb5bdfda862f3e55644eaa9d09c2</string>
               <key>url</key>
-	      <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/269934/arch/CYGWIN/installer/fmodex-4.44-windows-20130204.tar.bz2</string>
+	      <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/3p-fmodex-private/rev/269946/arch/CYGWIN/installer/fmodex-4.44-windows-20130204.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index c3c30d87fe..40a43884a1 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -260,7 +260,7 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 	mSystem->getSoftwareFormat(&r_samplerate, NULL, &r_channels, NULL, NULL, &r_bits);
 	mSystem->getDriverInfo(0, r_name, 255, 0);
 	r_name[255] = '\0';
-	int latency = 1000.0 * r_bufferlength * r_numbuffers /r_samplerate;
+	int latency = (int)(1000.0f * r_bufferlength * r_numbuffers / r_samplerate);
 
 	LL_INFOS("AppInit") << "FMOD device: "<< r_name << "\n"
 		<< "FMOD Ex parameters: " << r_samplerate << " Hz * " << r_channels << " * " <<r_bits <<" bit\n"
-- 
cgit v1.2.3