diff options
| author | Jacek Antonelli | 2008-08-15 23:44:48 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:44:48 -0500 |
| commit | 9b4f54c826ffa4f94efa866068c9d6ecdfb4b424 (patch) | |
| tree | 2f8ae193ab487088962e628f1ee9dee2f5901f01 /linden/indra/newview/lltexlayer.cpp | |
| parent | Second Life viewer sources 1.13.2.12 (diff) | |
| download | meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.zip meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.gz meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.bz2 meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.xz | |
Second Life viewer sources 1.13.2.15
Diffstat (limited to 'linden/indra/newview/lltexlayer.cpp')
| -rw-r--r-- | linden/indra/newview/lltexlayer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/lltexlayer.cpp b/linden/indra/newview/lltexlayer.cpp index 0292417..63d167d 100644 --- a/linden/indra/newview/lltexlayer.cpp +++ b/linden/indra/newview/lltexlayer.cpp | |||
| @@ -487,7 +487,7 @@ void LLTexLayerSetBuffer::readBackAndUpload(U8* baked_bump_data) | |||
| 487 | // static | 487 | // static |
| 488 | void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* userdata, S32 result) // StoreAssetData callback (not fixed) | 488 | void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, void* userdata, S32 result) // StoreAssetData callback (not fixed) |
| 489 | { | 489 | { |
| 490 | LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)(U32)userdata; | 490 | LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)userdata; |
| 491 | 491 | ||
| 492 | LLVOAvatar* avatar = gAgent.getAvatarObject(); | 492 | LLVOAvatar* avatar = gAgent.getAvatarObject(); |
| 493 | 493 | ||