livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-3671 Fix is changed to solve issue with other multi-previews

meow-7.2.2
Mnikolenko ProductEngine 2014-02-25 17:06:06 +02:00
parent 0b9eeb02ab
commit 5705a2c018
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llpreview.cpp
View File

@ -91,6 +91,7 @@ void LLPreview::setObjectID(const LLUUID& object_id)
{
loadAsset();
}
refreshFromItem();
}
void LLPreview::setItem( LLInventoryItem* item )
@ -100,6 +101,7 @@ void LLPreview::setItem( LLInventoryItem* item )
{
loadAsset();
}
refreshFromItem();
}
const LLInventoryItem *LLPreview::getItem() const

2
indra/newview/llpreviewscript.cpp
View File

@ -1879,7 +1879,7 @@ void LLLiveLSLEditor::loadAsset()
mIsModifiable = item && gAgent.allowOperation(PERM_MODIFY,
item->getPermissions(),
GP_OBJECT_MANIPULATE);
refreshFromItem();
// This is commented out, because we don't completely
// handle script exports yet.
/*