summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2016-07-29 17:53:33 +0300
committerMnikolenko Productengine <mnikolenko@productengine.com>2016-07-29 17:53:33 +0300
commitbcadc2c1b35d458d0a90293f77778f4313f47ba4 (patch)
tree3c10239d7d845237fe2e7e0706047d9bffc5ea22 /indra/newview/llinventorymodel.cpp
parentc86ab13b6b44aafc4f5fae8388c7d3f55cc5b0bc (diff)
MAINT-1660 Don't hide script editor floater immediately after removing script from inventory.
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 5230e8dff9..503fa28a33 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1395,7 +1395,11 @@ void LLInventoryModel::onObjectDeletedFromServer(const LLUUID& object_id, bool f
}
// From purgeObject()
- LLPreview::hide(object_id);
+ LLViewerInventoryItem *item = getItem(object_id);
+ if (item && (item->getType() != LLAssetType::AT_LSL_TEXT))
+ {
+ LLPreview::hide(object_id, TRUE);
+ }
deleteObject(object_id, fix_broken_links, do_notify_observers);
}
}