diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-22 16:28:45 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-22 16:28:45 +0200 |
| commit | 5f334e18b837493f9c6f7a62eb61f0aeec94d28b (patch) | |
| tree | 048347781b2f7adf0c1a20b2c2033400c7ab203b /indra/newview/lltexlayer.cpp | |
| parent | 7f42a0e8affe1a3394116d1457830f774deb7438 (diff) | |
| parent | 1fb9389822405bae537d7203cd56ffee5f717664 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 4a7d784c3e..84c8b9d5f0 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -1140,6 +1140,10 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable ) // This sets mInfo and calls initialization functions { //llassert(mInfo == NULL); // nyx says this is probably bogus but needs investigating + if (mInfo != NULL) // above llassert(), but softened into a warning + { + llwarns << "BAD STUFF! mInfo != NULL" << llendl; + } mInfo = info; //mID = info->mID; // No ID |