Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCC doing its thing (by being picky).

Browse Source
This commit is contained in:
Shyotl
2012-05-17 00:47:00 -05:00
parent dbe50efc10
commit 9eda9ad462
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llappearancemgr.cpp
View File

@@ -3115,7 +3115,7 @@ private:
{} {}
virtual void dispatch() 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(), copy_inventory_item(gAgent.getID(),
base_item->getPermissions().getOwner(), base_item->getPermissions().getOwner(),
base_item->getUUID(), base_item->getUUID(),
@@ -3176,7 +3176,7 @@ public:
if(item_id.notNull()) if(item_id.notNull())
LLShowCreatedOutfit::fire(item_id); 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()) if(it != mActiveRequests.end())
{ {
const LLViewerInventoryItem* old_item = (*it)->getItem(); const LLViewerInventoryItem* old_item = (*it)->getItem();