diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 3a0723d51c..709ee61909 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -194,6 +194,13 @@ if (LINUX)
     set(CMAKE_CXX_FLAGS "-Wno-attributes ${CMAKE_CXX_FLAGS}")
   endif (${CXX_VERSION_NUMBER} GREATER 470)
   #</FS:ND>
+  #<FS:ND> GCC >= 4.6 has constexpr and c++11. Use it
+  if(${CXX_VERSION_NUMBER} GREATER 460)
+    add_definitions( -DND_USE_CONSTEXPR )
+    set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+  endif (${CXX_VERSION_NUMBER} GREATER 460)
+  #</FS:ND>
+
 
   # End of hacks.
 
diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index c21162ae25..a9a5902476 100644
--- a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -113,7 +113,11 @@ private:
 	bool play(double rate);
 	bool getTimePos(double &sec_out);
 
-	static const double MIN_LOOP_SEC = 1.0F;
+#ifdef ND_USE_CONSTEXPR
+	static constexpr double MIN_LOOP_SEC = 1.0f;
+#else
+	static double MIN_LOOP_SEC = 1.0f;
+#endif
 
 	bool mIsLooping;