diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-07-29 17:53:33 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2016-07-29 17:53:33 +0300 |
| commit | bcadc2c1b35d458d0a90293f77778f4313f47ba4 (patch) | |
| tree | 3c10239d7d845237fe2e7e0706047d9bffc5ea22 /indra/newview/llinventorybridge.cpp | |
| parent | c86ab13b6b44aafc4f5fae8388c7d3f55cc5b0bc (diff) | |
MAINT-1660 Don't hide script editor floater immediately after removing script from inventory.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index f4bf38f65d..8d130c08e5 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1933,13 +1933,15 @@ BOOL LLItemBridge::removeItem() } // move it to the trash - LLPreview::hide(mUUID, TRUE); LLInventoryModel* model = getInventoryModel(); if(!model) return FALSE; const LLUUID& trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH); LLViewerInventoryItem* item = getItem(); if (!item) return FALSE; - + if (item->getType() != LLAssetType::AT_LSL_TEXT) + { + LLPreview::hide(mUUID, TRUE); + } // Already in trash if (model->isObjectDescendentOf(mUUID, trash_id)) return FALSE; |