diff options
| author | callum <none@none> | 2009-10-22 15:35:14 -0700 |
|---|---|---|
| committer | callum <none@none> | 2009-10-22 15:35:14 -0700 |
| commit | 35e8a7cae665ac42e94680e13fb267eb3a6e3cfb (patch) | |
| tree | 204d51f94889440d7787e895e0e8b09832d2e0e4 /indra/newview/llwearable.cpp | |
| parent | f7e4f1d1a505c0394d45e0dfd762620a62ffdafa (diff) | |
| parent | aba9c25556e1a4477849fd81b81420c3e322e3f7 (diff) | |
Merge my changes with rev. 2603
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index d1ad89442c..b219081cb8 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -408,9 +408,10 @@ BOOL LLWearable::importFile( LLFILE* file ) { delete mSavedTEMap[te]; } - - mTEMap[te] = new LLLocalTextureObject(image, LLUUID(text_buffer)); - mSavedTEMap[te] = new LLLocalTextureObject(image, LLUUID(text_buffer)); + + LLUUID textureid(text_buffer); + mTEMap[te] = new LLLocalTextureObject(image, textureid); + mSavedTEMap[te] = new LLLocalTextureObject(image, textureid); createLayers(te); } |