1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 585f769..e83aa0d 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -203,6 +203,7 @@ LLPointer<LLImageGL> gStartImageGL;
 static LLHost gAgentSimHost;
 static BOOL gSkipOptionalUpdate = FALSE;
 
+bool gUseQuickTime = true;
 bool gQuickTimeInitialized = false;
 static bool gGotUseCircuitCodeAck = false;
 LLString gInitialOutfit;
@@ -1867,7 +1868,8 @@ BOOL idle_startup()
                 }
 
                 #if LL_QUICKTIME_ENABLED        // windows only right now but will be ported to mac 
-                if (!gQuickTimeInitialized)
+                if (gUseQuickTime
+                        && !gQuickTimeInitialized)
                 {
                         // initialize quicktime libraries (fails gracefully if quicktime not installed ($QUICKTIME)
                         llinfos << "Initializing QuickTime...." << llendl;