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

SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of onAISUpdateReceived.

master
Brad Payne (Vir Linden) 2013-06-05 15:13:48 -04:00
parent 63940048ef
commit f7c9739fd9
5 changed files with 182 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llsdutil.cpp
View File

@ -182,7 +182,7 @@ char* ll_pretty_print_sd_ptr(const LLSD* sd)
char* ll_pretty_print_sd(const LLSD& sd)
{
const U32 bufferSize = 10 * 1024;
const U32 bufferSize = 100 * 1024;
static char buffer[bufferSize];
std::ostringstream stream;
//stream.rdbuf()->pubsetbuf(buffer, bufferSize);

6
indra/llinventory/llinventory.cpp
View File

@ -50,6 +50,7 @@ static const std::string INV_DESC_LABEL("desc");
static const std::string INV_PERMISSIONS_LABEL("permissions");
static const std::string INV_SHADOW_ID_LABEL("shadow_id");
static const std::string INV_ASSET_ID_LABEL("asset_id");
static const std::string INV_LINKED_ID_LABEL("linked_id");
static const std::string INV_SALE_INFO_LABEL("sale_info");
static const std::string INV_FLAGS_LABEL("flags");
static const std::string INV_CREATION_DATE_LABEL("created_at");
@ -1109,6 +1110,11 @@ bool LLInventoryItem::fromLLSD(const LLSD& sd)
{
mAssetUUID = sd[w];
}
w = INV_LINKED_ID_LABEL;
if (sd.has(w))
{
mAssetUUID = sd[w];
}
w = INV_ASSET_TYPE_LABEL;
if (sd.has(w))
{

173
indra/newview/llinventorymodel.cpp
View File

@ -1172,77 +1172,188 @@ void LLInventoryModel::onAISUpdateReceived(const std::string& context, const LLS
{
LL_DEBUGS("Inventory") << "ais update " << context << ":" << ll_pretty_print_sd(update) << llendl;
// Track changes to descendent counts for accounting.
std::map<LLUUID,S32> cat_deltas;
typedef std::map<LLUUID,LLPointer<LLViewerInventoryItem> > deferred_item_map_t;
deferred_item_map_t items_created;
deferred_item_map_t items_updated;
std::set<LLUUID> objects_deleted;
// parse _categories_removed -> objects_deleted
uuid_vec_t cat_ids;
parse_llsd_uuid_array(update,"_categories_removed",cat_ids);
for (uuid_vec_t::const_iterator it = cat_ids.begin();
it != cat_ids.end(); ++it)
{
onObjectDeletedFromServer(*it, false);
LLViewerInventoryCategory *cat = getCategory(*it);
cat_deltas[cat->getParentUUID()]--;
objects_deleted.insert(*it);
}
// parse _categories_items_removed -> objects_deleted
uuid_vec_t item_ids;
parse_llsd_uuid_array(update,"_category_items_removed",item_ids);
for (uuid_vec_t::const_iterator it = item_ids.begin();
it != item_ids.end(); ++it)
{
onObjectDeletedFromServer(*it, false);
LLViewerInventoryItem *item = getItem(*it);
cat_deltas[item->getParentUUID()]--;
objects_deleted.insert(*it);
}
// parse _broken_links_removed -> objects_deleted
uuid_vec_t broken_link_ids;
parse_llsd_uuid_array(update,"_broken_links_removed",broken_link_ids);
for (uuid_vec_t::const_iterator it = broken_link_ids.begin();
it != broken_link_ids.end(); ++it)
{
onObjectDeletedFromServer(*it, false);
LLViewerInventoryItem *item = getItem(*it);
cat_deltas[item->getParentUUID()]--;
objects_deleted.insert(*it);
}
// parse _created_items
uuid_vec_t created_item_ids;
parse_llsd_uuid_array(update,"_created_items",created_item_ids);
if (update.has("_embedded"))
{
const LLSD& embedded = update["_embedded"];
for(LLSD::map_const_iterator it = embedded.beginMap(),
end = embedded.endMap();
it != end; ++it)
{
const std::string& field = (*it).first;
// parse created links
if (field == "link")
{
const LLSD& links = embedded["link"];
for(LLSD::map_const_iterator linkit = links.beginMap(),
linkend = links.endMap();
linkit != linkend; ++linkit)
{
const LLUUID link_id((*linkit).first);
const LLSD& link_map = (*linkit).second;
uuid_vec_t::const_iterator pos =
std::find(created_item_ids.begin(),
created_item_ids.end(),link_id);
if (pos != created_item_ids.end())
{
LLPointer<LLViewerInventoryItem> new_link(new LLViewerInventoryItem);
BOOL rv = new_link->unpackMessage(link_map);
if (rv)
{
items_created[link_id] = new_link;
const LLUUID& parent_id = new_link->getParentUUID();
cat_deltas[parent_id]++;
}
else
{
llwarns << "failed to unpack" << llendl;
}
}
else
{
LL_DEBUGS("Inventory") << "Ignoring link not in created items list " << link_id << llendl;
}
}
}
else
{
llwarns << "unrecognized embedded field " << field << llendl;
}
}
}
// Parse item update at the top level.
if (update.has("item_id"))
{
// item has been modified or possibly created (would be better if we could distinguish these cases directly)
LLUUID item_id = update["item_id"].asUUID();
LLViewerInventoryItem *item = gInventory.getItem(item_id);
LLViewerInventoryCategory *cat = gInventory.getCategory(item_id);
if (item)
LLPointer<LLViewerInventoryItem> new_item(new LLViewerInventoryItem);
BOOL rv = new_item->unpackMessage(update);
if (rv)
{
LLSD changes;
if (update.has("name") && update["name"] != item->getName())
{
changes["name"] = update["name"];
}
if (update.has("desc") && update["desc"] != item->getActualDescription())
{
changes["desc"] = update["desc"];
}
onItemUpdated(item_id,changes,true);
}
else if (cat)
{
llerrs << "don't handle cat update yet" << llendl;
items_updated[item_id] = new_item;
// This statement is here to cause a new entry with 0
// delta to be created if it does not already exist;
// otherwise has no effect.
cat_deltas[new_item->getParentUUID()];
}
else
{
llerrs << "don't handle creation case yet" << llendl;
llerrs << "unpack failed" << llendl;
}
}
// Do descendent/version accounting.
// Can remove this if/when we use the version info directly.
for (std::map<LLUUID,S32>::const_iterator catit = cat_deltas.begin();
catit != cat_deltas.end(); ++catit)
{
const LLUUID cat_id(catit->first);
S32 delta = catit->second;
LLInventoryModel::LLCategoryUpdate up(cat_id, delta);
gInventory.accountForUpdate(up);
}
// TODO - how can we use this version info? Need to be sure all
// changes are going through AIS first, or at least through
// something with a reliable responder.
#if 0
const std::string& ucv = "_updated_category_versions";
if (update.has(ucv))
{
for(LLSD::map_const_iterator it = update[ucv].beginMap(),
end = update[ucv].endMap();
it != end; ++it)
it != end; ++it)
{
const LLUUID id((*it).first);
S32 version = (*it).second.asInteger();
LLViewerInventoryCategory *cat = gInventory.getCategory(id);
if (cat->getVersion() != version)
{
llwarns << "Possible version mismatch, viewer " << cat->getVersion()
<< " server " << version << llendl;
}
}
}
#endif
// CREATE ITEMS
for (deferred_item_map_t::const_iterator create_it = items_created.begin();
create_it != items_created.end(); ++create_it)
{
LLUUID item_id(create_it->first);
LLPointer<LLViewerInventoryItem> new_item = create_it->second;
// FIXME risky function since it calls updateServer() in some
// cases. Maybe break out the update/create cases, in which
// case this is create.
LL_DEBUGS("Inventory") << "created item " << item_id << llendl;
gInventory.updateItem(new_item);
}
// UPDATE ITEMS
for (deferred_item_map_t::const_iterator update_it = items_updated.begin();
update_it != items_updated.end(); ++update_it)
{
LLUUID item_id(update_it->first);
LLPointer<LLViewerInventoryItem> new_item = update_it->second;
// FIXME risky function since it calls updateServer() in some
// cases. Maybe break out the update/create cases, in which
// case this is update.
LL_DEBUGS("Inventory") << "updated item " << item_id << llendl;
gInventory.updateItem(new_item);
}
// DELETE OBJECTS
for (std::set<LLUUID>::const_iterator del_it = objects_deleted.begin();
del_it != objects_deleted.end(); ++del_it)
{
LL_DEBUGS("Inventory") << "deleted item " << *del_it << llendl;
onObjectDeletedFromServer(*del_it, false, false);
}
}
void LLInventoryModel::onItemUpdated(const LLUUID& item_id, const LLSD& updates, bool update_parent_version)
@ -1395,7 +1506,7 @@ void LLInventoryModel::onDescendentsPurgedFromServer(const LLUUID& object_id, bo
// Update model after an item is confirmed as removed from
// server. Works for categories or items.
void LLInventoryModel::onObjectDeletedFromServer(const LLUUID& object_id, bool fix_broken_links)
void LLInventoryModel::onObjectDeletedFromServer(const LLUUID& object_id, bool fix_broken_links, bool update_parent_version)
{
LLPointer<LLInventoryObject> obj = getObject(object_id);
if(obj)
@ -1406,9 +1517,13 @@ void LLInventoryModel::onObjectDeletedFromServer(const LLUUID& object_id, bool f
onDescendentsPurgedFromServer(object_id, fix_broken_links);
}
// From item/cat removeFromServer()
LLInventoryModel::LLCategoryUpdate up(obj->getParentUUID(), -1);
accountForUpdate(up);
if (update_parent_version)
{
LLInventoryModel::LLCategoryUpdate up(obj->getParentUUID(), -1);
accountForUpdate(up);
}
// From purgeObject()
LLPreview::hide(object_id);

2
indra/newview/llinventorymodel.h
View File

@ -334,7 +334,7 @@ public:
// Update model after an item is confirmed as removed from
// server. Works for categories or items.
void onObjectDeletedFromServer(const LLUUID& item_id, bool fix_broken_links = true);
void onObjectDeletedFromServer(const LLUUID& item_id, bool fix_broken_links = true, bool update_parent_version = true);
// Update model after all descendents removed from server.
void onDescendentsPurgedFromServer(const LLUUID& object_id, bool fix_broken_links = true);

32
indra/newview/llviewerinventory.cpp
View File

@ -493,6 +493,34 @@ private:
LLSD mUpdates;
};
class SlamFolderCommand: public AISCommand
{
public:
SlamFolderCommand(const LLUUID& folder_id, const LLSD& contents, LLPointer<LLInventoryCallback> callback):
mContents(contents),
AISCommand(callback)
{
std::string cap;
if (!getCap(cap))
{
llwarns << "No cap found" << llendl;
return;
}
LLUUID tid;
tid.generate();
std::string url = cap + std::string("/category/") + folder_id.asString() + "/links?tid=" + tid.asString();
llinfos << url << llendl;
LLCurl::ResponderPtr responder = this;
LLSD headers;
headers["Content-Type"] = "application/llsd+xml";
F32 timeout = HTTP_REQUEST_EXPIRY_SECS;
command_func_type cmd = boost::bind(&LLHTTPClient::put, url, mContents, responder, headers, timeout);
setCommandFunc(cmd);
}
private:
LLSD mContents;
};
///----------------------------------------------------------------------------
/// Class LLViewerInventoryItem
///----------------------------------------------------------------------------
@ -1835,8 +1863,8 @@ void slam_inventory_folder(const LLUUID& folder_id,
std::string cap;
if (AISCommand::getCap(cap))
{
//LLPointer<AISCommand> cmd_ptr = new SlamFolderCommand(folder_id, contents, cb);
//cmd_ptr->run_command();
LLPointer<AISCommand> cmd_ptr = new SlamFolderCommand(folder_id, contents, cb);
cmd_ptr->run_command();
}
else // no cap
{