GCC doing its thing (by being picky).

This commit is contained in:
Shyotl
2012-05-17 00:47:00 -05:00
parent dbe50efc10
commit 9eda9ad462

View File

@@ -3115,7 +3115,7 @@ private:
{}
virtual void dispatch()
{
const LLViewerInventoryItem* base_item = mItem->getLinkedItem() ? mItem->getLinkedItem() : mItem;
const LLViewerInventoryItem* base_item = mItem->getLinkedItem() ? mItem->getLinkedItem() : mItem.get();
copy_inventory_item(gAgent.getID(),
base_item->getPermissions().getOwner(),
base_item->getUUID(),
@@ -3176,7 +3176,7 @@ public:
if(item_id.notNull())
LLShowCreatedOutfit::fire(item_id);
std::vector<const LLCreateBase*>::const_iterator it = std::find(mActiveRequests.begin(), mActiveRequests.end(),cb);
std::vector<const LLCreateBase*>::iterator it = std::find(mActiveRequests.begin(), mActiveRequests.end(),cb);
if(it != mActiveRequests.end())
{
const LLViewerInventoryItem* old_item = (*it)->getItem();