diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 11:33:56 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 11:33:56 -0800 |
| commit | 92cef0426df15c0e661fa795e6b00214f381dd05 (patch) | |
| tree | 4aa5f2277e140e98c381bdcd0facba64d4f0deca /indra/newview/lltexlayer.cpp | |
| parent | c6163fafaac9c72683b11894ed309d1f55a745c8 (diff) | |
| parent | 7f61cde331880baa21801aa0c1c1ccf9dc57946f (diff) | |
automated merge from trunk
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 |