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

Merge r135130 for DEV-4476 - Edits to notecards not visible in viewer session

meow-7.2.2
Brian McGroarty 2009-10-14 20:49:17 +00:00
parent 2cea021f5e
commit f25602181f
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llassetuploadresponders.cpp
View File

@ -539,7 +539,7 @@ void LLUpdateTaskInventoryResponder::uploadComplete(const LLSD& content)
gVFS->removeFile(content["new_asset"].asUUID(),
LLAssetType::AT_NOTECARD);
}
nc->setAssetId(content["new_asset"].asUUID());
nc->refreshFromInventory();
}
break;

28
indra/newview/llpreview.cpp
View File

@ -492,3 +492,31 @@ void LLMultiPreview::tabOpen(LLFloater* opened_floater, bool from_click)
}
}
void LLPreview::setAssetId(const LLUUID& asset_id)
{
const LLViewerInventoryItem* item = dynamic_cast<const LLViewerInventoryItem*>(getItem());
if(NULL == item)
{
return;
}
if(mObjectUUID.isNull())
{
// Update avatar inventory asset_id.
LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
new_item->setAssetUUID(asset_id);
gInventory.updateItem(new_item);
gInventory.notifyObservers();
}
else
{
// Update object inventory asset_id.
LLViewerObject* object = gObjectList.findObject(mObjectUUID);
if(NULL == object)
{
return;
}
object->updateViewerInventoryAsset(item, asset_id);
}
}

1
indra/newview/llpreview.h
View File

@ -77,6 +77,7 @@ public:
void setObjectID(const LLUUID& object_id);
void setItem( LLInventoryItem* item );
void setAssetId(const LLUUID& asset_id);
const LLInventoryItem* getItem() const; // searches if not constructed with it
static void hide(const LLUUID& item_uuid, BOOL no_saving = FALSE );