summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2008-02-25 20:18:33 +0000
committerCallum Prentice <callum@lindenlab.com>2008-02-25 20:18:33 +0000
commit03337b9142305a8d0b8744505c498ae19dd4c9a2 (patch)
treee9488fbc6b2ccccfa86a2dbbf9cb24214f51e27c /indra
parent34527df7401f48037205550fc5986da14684cf23 (diff)
DEV-10924 -- Release build is broken using "Debug" configuration
Quite a few tweaks to get it to build/run - details in the Jira Reviewed by Mani
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llmimetypes.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmimetypes.cpp b/indra/newview/llmimetypes.cpp
index 66f6b04720..67f7532ff6 100644
--- a/indra/newview/llmimetypes.cpp
+++ b/indra/newview/llmimetypes.cpp
@@ -53,7 +53,7 @@ bool LLMIMETypes::parseMIMETypes(const LLString& xml_filename)
{
LLXMLNodePtr root;
bool success = LLViewerUICtrlFactory::getLayeredXMLNode(xml_filename, root);
- if (!success || !root || !root->hasName("mimetypes"))
+ if ( ! success || ! root.isNull() || ! root->hasName( "mimetypes" ) )
{
llwarns << "Unable to read MIME type file: "
<< xml_filename << llendl;