diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-22 14:55:39 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-22 14:55:39 -0500 |
| commit | 3b0ba0c2d7f48a5d1cf2adcbc87c9eaf4d8f6564 (patch) | |
| tree | dc2c080606407dc5f9f2c872d3dd40a465acecf8 /indra/newview/lltexlayer.cpp | |
| parent | 1f896d2d58d9c150d3981f253e81898afa999c2c (diff) | |
| parent | fa891c062ef66410123c66de1ef67b7dcef327db (diff) | |
automated merge viewer2.0->viewer2.0
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 |