diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-10-19 12:13:28 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2015-10-19 12:13:28 +0300 |
| commit | e33be3b91feb069c654dca2aeb4f48ce2f9ef4ea (patch) | |
| tree | ed1f9eeae7ecad9687c1e8c4633be40ded4ba857 /indra/newview | |
| parent | 4a187aec4ef05ef8c78fc23e0cf95a87566c8998 (diff) | |
MAINT-5753 FIXED Viewer crashes when opening a texture from object contents
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llpanelobjectinventory.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 7e65ccad98..c4211d5508 100755 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -905,7 +905,11 @@ void LLTaskTextureBridge::openItem() LLPreviewTexture* preview = LLFloaterReg::showTypedInstance<LLPreviewTexture>("preview_texture", LLSD(mUUID), TAKE_FOCUS_YES); if(preview) { - preview->setAuxItem(findItem()); + LLInventoryItem* item = findItem(); + if(item) + { + preview->setAuxItem(item); + } preview->setObjectID(mPanel->getTaskUUID()); } } |