diff options
| author | Martin Reddy <lynx@lindenlab.com> | 2009-10-01 10:23:23 +0000 |
|---|---|---|
| committer | Martin Reddy <lynx@lindenlab.com> | 2009-10-01 10:23:23 +0000 |
| commit | 090977608d3d4e1d6d26689064910221c66f6084 (patch) | |
| tree | bc349ebbe21286d75111f5816ca32f3b4007eb31 /indra | |
| parent | a0a5c8e615869d449bfad94ec9a650aad82cab91 (diff) | |
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.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloaterhelpbrowser.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
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() |