diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-15 15:40:43 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-15 15:40:43 -0500 |
| commit | 64a4a13397ea7b895ebbeb707bdba72e2d97ff6b (patch) | |
| tree | ef28338a5a563a7b7bce2f8fb833e82a9385cf3c /indra/newview/llpanelface.cpp | |
| parent | b7cd89da5f74663a9fd547af77afaed06cdb05fd (diff) | |
fix crasher in setNumTEs
Diffstat (limited to 'indra/newview/llpanelface.cpp')
| -rw-r--r-- | indra/newview/llpanelface.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 7e9fe212dd..5c4c2693f8 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1290,6 +1290,7 @@ void LLPanelFace::onMaterialLoaded(const LLMaterialID& material_id, const LLMate void LLPanelFace::updateMaterial() { + LL_WARNS("Materials") << LL_ENDL; if (mUpdateInFlight) { LL_WARNS("Materials") << "Attempt to update material while a previous update is pending ignored." << LL_ENDL; @@ -1351,7 +1352,7 @@ void LLPanelFace::updateMaterial() mMaterial->setEnvironmentIntensity((U8)(255*getChild<LLUICtrl>("environment")->getValue().asReal())); mMaterial->setDiffuseAlphaMode(getChild<LLComboBox>("combobox alphamode")->getCurrentIndex()); mMaterial->setAlphaMaskCutoff((U8)(getChild<LLUICtrl>("maskcutoff")->getValue().asInteger())); - llinfos << "Updating material: " << mMaterial->asLLSD() << llendl; + LL_DEBUGS("Materials") << "Updating material: " << mMaterial->asLLSD() << LL_ENDL; LLSelectMgr::getInstance()->selectionSetMaterial( mMaterial ); // We've sent an update. Need to hold off on any more until @@ -1363,7 +1364,7 @@ void LLPanelFace::updateMaterial() // The user has specified settings that don't need a material. if (mMaterial || !mMaterialID.isNull()) { - llinfos << "Resetting material entry" << llendl; + LL_DEBUGS("Materials") << "Resetting material entry" << LL_ENDL; mMaterial.reset(); mMaterialID = LLMaterialID::null; // Delete existing material entry... @@ -1657,6 +1658,7 @@ void LLPanelFace::onSelectTexture(const LLSD& data) void LLPanelFace::onCommitMaterialTexture( const LLSD& data ) { + LL_DEBUGS("Materials") << data << "\n" << (mUpdateInFlight ? "In Flight" : "Now Pending" ) << LL_ENDL; if (!mUpdateInFlight) { updateMaterial(); @@ -1682,6 +1684,7 @@ void LLPanelFace::onCancelMaterialTexture(const LLSD& data) void LLPanelFace::onSelectMaterialTexture(const LLSD& data) { + LL_DEBUGS("Materials") << data << LL_ENDL; if (!mUpdateInFlight) { updateMaterial(); |