diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-22 16:19:11 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-22 16:19:11 +0200 |
| commit | ad501d7fab624c7a85a70fb66e3e24667984f880 (patch) | |
| tree | 2d5fcb404302f849e72db08ebd9664c1825ecc52 /indra/newview/lltexlayer.cpp | |
| parent | 74429f2ed926362a2ec47d590fc862b55b26f0f8 (diff) | |
| parent | bc0ed2a02b42ae485b2f7a08f6ec3a0c1ab85778 (diff) | |
Merge from default branch
--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 |