diff --git a/autobuild.xml b/autobuild.xml
index 866e7595f5..d58d5844d1 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -542,9 +542,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>a3e8784c5640d3e3d7ff4db16c5bb0ae</string>
+              <string>1451d216c5a118eae4c642b6adaa6c0a</string>
               <key>url</key>
-              <string>file:///opt/firestorm/fmod-3.75-darwin-20110620.tar.bz2</string>
+              <string>https://bitbucket.org/cinderblocks/ragnarok/downloads/fmod-3.75-darwin-20120829.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -2438,7 +2438,6 @@
                   <string>--build</string>
                   <string>--platform darwin</string>
                   <string>--fmod</string>
-                  <string>--kdu</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2446,7 +2445,6 @@
                 <key>options</key>
                 <array>
                   <string>--fmod</string>
-                  <string>--kdu</string>
                   <string>--platform darwin</string>
                 </array>
               </map>
@@ -2465,7 +2463,6 @@
                   <string>--build</string>
                   <string>--platform darwin</string>
                   <string>--fmod</string>
-                  <string>--kdu</string>
                 </array>
               </map>
               <key>configure</key>
@@ -2473,7 +2470,6 @@
                 <key>options</key>
                 <array>
                   <string>--fmod</string>
-                  <string>--kdu</string>
                   <string>--platform darwin</string>
                 </array>
               </map>
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index 09483d0d41..4f3338dba7 100644
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -57,9 +57,9 @@ void parse_string();
 #define ECHO do { } while (0)
 
 #if defined(__cplusplus)
-extern "C" { int yylex( void ); }
-extern "C" { int yyparse( void ); }
-extern "C" { int yyerror(const char *fmt, ...); }
+extern int yylex( void );
+extern int yyparse( void );
+extern int yyerror(const char *fmt, ...);
 #endif
 
 %}
diff --git a/indra/lscript/lscript_compile/indra.y b/indra/lscript/lscript_compile/indra.y
index e4b10ffdd9..e17257a462 100644
--- a/indra/lscript/lscript_compile/indra.y
+++ b/indra/lscript/lscript_compile/indra.y
@@ -3,7 +3,7 @@
 	#include "lscript_tree.h"
 
     #ifdef __cplusplus
-    extern "C" {
+    extern
     #endif
 
 	int yylex(void);
@@ -21,7 +21,7 @@
 	#endif
 
     #ifdef __cplusplus
-    }
+    //}
     #endif
 %}
 
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ee96140c6e..1d0bf8de46 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -487,7 +487,10 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 			}
 		}
 	}
-	if (retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED)) 
+// <FS:CR> OpenSim returns a zero. Don't request MediaData where MOAP isn't supported
+	//if (retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED))
+	if (retval != 0 && retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED))
+// </FS:CR>
 	{
 		// If only the media URL changed, and it isn't a media version URL,
 		// ignore it