diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-08-26 18:09:17 -0400 | 
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-08-26 18:09:17 -0400 | 
| commit | 1eeeada0f7c20f190032daa651f884a4a1525df1 (patch) | |
| tree | cee27b95b3759d878cbf3bd4f618182efc10e4d9 /indra | |
| parent | 0d305552003d8378f692cddf87caebb7c47d8ab3 (diff) | |
buildfix - replaced NULL with FALSE
gcc doesn't like passing NULL where you mean FALSE. This unsticks the linux build.
de-minimis change, no review.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatermodelpreview.cpp | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp index 91dfb9fc1c..a283be7aa7 100644 --- a/indra/newview/llfloatermodelpreview.cpp +++ b/indra/newview/llfloatermodelpreview.cpp @@ -1703,7 +1703,7 @@ LLImportMaterial LLModelLoader::profileToMaterial(domProfile_COMMON* material)  									std::string filename = cdom::uriToNativePath(init->getValue().str());  									mat.mDiffuseMap = LLViewerTextureManager::getFetchedTextureFromUrl("file://" + filename, TRUE, LLViewerTexture::BOOST_PREVIEW); -									mat.mDiffuseMap->setLoadedCallback(LLModelPreview::textureLoadedCallback, 0, TRUE, FALSE, this->mPreview, NULL, NULL); +									mat.mDiffuseMap->setLoadedCallback(LLModelPreview::textureLoadedCallback, 0, TRUE, FALSE, this->mPreview, NULL, FALSE);  									mat.mDiffuseMap->forceToSaveRawImage();  									mat.mDiffuseMapFilename = filename; | 
