From 090977608d3d4e1d6d26689064910221c66f6084 Mon Sep 17 00:00:00 2001 From: Martin Reddy Date: Thu, 1 Oct 2009 10:23:23 +0000 Subject: DEV-39995: the help browser would crash on open if the media ctrl returned no media plugin for text/html (NULL dereference), which seems to be happening in viewer-2.0.0-3 for me at the moment. Clearly there's not too much to do if we can't display HTML, but this fix will at least stop the help browser from crashing. --- indra/newview/llfloaterhelpbrowser.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llfloaterhelpbrowser.cpp b/indra/newview/llfloaterhelpbrowser.cpp index d67b26d36c..6b0b5ed5e0 100644 --- a/indra/newview/llfloaterhelpbrowser.cpp +++ b/indra/newview/llfloaterhelpbrowser.cpp @@ -72,7 +72,11 @@ void LLFloaterHelpBrowser::buildURLHistory() LLSD browser_history = LLURLHistory::getURLHistory("browser"); // initialize URL history in the plugin - mBrowser->getMediaPlugin()->initializeUrlHistory(browser_history); + LLPluginClassMedia *plugin = mBrowser->getMediaPlugin(); + if (plugin) + { + plugin->initializeUrlHistory(browser_history); + } } void LLFloaterHelpBrowser::onClose() -- cgit v1.2.3