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

Fix crash when item just added to inventory is renamed. From Henri Beauchamp, adapted to Phoenix by Ansariel Hiller. From PHOE-2529.

meow-7.2.2
Tonya Souther 2011-02-22 19:47:52 -06:00
parent ea88cf2024
commit 397ab96200
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewerinventory.cpp
View File

@ -323,8 +323,9 @@ void LLViewerInventoryItem::updateServer(BOOL is_new) const
{
// *FIX: deal with this better.
// If we're crashing here then the UI is incorrectly enabled.
llerrs << "LLViewerInventoryItem::updateServer() - for incomplete item"
llwarns << "LLViewerInventoryItem::updateServer() - for incomplete item"
<< llendl;
LLNotificationsUtil::add("IncompleteInventoryItem");
return;
}
if(gAgent.getID() != mPermissions.getOwner())

7
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -4767,6 +4767,13 @@ Unable to load the script. Please try again.
Some of the contents are you trying to share cannot be given/transferred just yet. Please try offering these items again in a bit.
</notification>
<notification
icon="notifytip.tga"
name="IncompleteInventoryItem"
type="notifytip">
The item you are accessing is not yet locally available. Please try again in a minute.
</notification>
<notification
icon="notifytip.tga"
name="CannotModifyProtectedCategories"