Skip to content
Snippets Groups Projects
Commit 5220b090 authored by andreykproductengine's avatar andreykproductengine
Browse files

MAINT-4897 FIXED Frequent error when texturing a linkset - "Unable to add...

MAINT-4897 FIXED Frequent error when texturing a linkset - "Unable to add texture. Please wait a few seconds and try again."
parent 903d9d12
Branches
Tags
No related merge requests found
...@@ -995,9 +995,15 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, ...@@ -995,9 +995,15 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
return TRUE; return TRUE;
} }
// In case the inventory has not been updated (e.g. due to some recent operation // In case the inventory has not been loaded (e.g. due to some recent operation
// causing a dirty inventory), stall the user while fetching the inventory. // causing a dirty inventory) and we can do an update, stall the user
if (hit_obj->isInventoryDirty()) // while fetching the inventory.
//
// Note: fetch only if inventory is both dirty and not present since previously checked faces
// could have requested new fetch for same item (removed inventory and marked as dirty=false).
// Objects without listeners (dirty==true and inventory!=NULL. In this specific case - before
// first fetch) shouldn't be updated either since we won't receive any changes.
if (hit_obj->isInventoryDirty() && hit_obj->getInventoryRoot() == NULL)
{ {
hit_obj->fetchInventoryFromServer(); hit_obj->fetchInventoryFromServer();
LLSD args; LLSD args;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment