diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-02 14:53:01 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-02-02 14:53:01 -0800 |
| commit | d14ecbace5c2d041fe4717c7d346083535267e24 (patch) | |
| tree | ae95d038763d50cd5fc2f962f144c028059b6c4f /indra/newview/lltexlayer.cpp | |
| parent | 58f813a136a5a889e01b39e96714af91402321ba (diff) | |
| parent | 2c0418dfe0a3e903210516a70fd947870c340bf8 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexlayer.cpp')
| -rw-r--r-- | indra/newview/lltexlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 72ef383be9..4a7d784c3e 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -1139,7 +1139,7 @@ LLTexLayerInterface::LLTexLayerInterface(const LLTexLayerInterface &layer, LLWea BOOL LLTexLayerInterface::setInfo(const LLTexLayerInfo *info, LLWearable* wearable ) // This sets mInfo and calls initialization functions { - llassert(mInfo == NULL); + //llassert(mInfo == NULL); // nyx says this is probably bogus but needs investigating mInfo = info; //mID = info->mID; // No ID |