From 718b68db629c14fae6c89716ccd961a57c738bb2 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Thu, 31 Mar 2016 17:10:10 -0700 Subject: I hate polluting the commit history. --- indra/newview/llviewerinventory.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra') diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 10de787a3a..5616c27370 100755 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -396,7 +396,7 @@ void LLViewerInventoryItem::updateServer(BOOL is_new) const updates.erase("shadow_id"); updates["hash_id"] = getTransactionID(); } - AISAPI::completion_t cr = boost::bind(&doInventoryCb, NULL, _1); + AISAPI::completion_t cr = boost::bind(&doInventoryCb, (LLPointer)NULL, _1); AISAPI::UpdateItem(getUUID(), updates, cr); } @@ -641,7 +641,7 @@ void LLViewerInventoryCategory::updateServer(BOOL is_new) const } LLSD new_llsd = asLLSD(); - AISAPI::completion_t cr = boost::bind(&doInventoryCb, NULL, _1); + AISAPI::completion_t cr = boost::bind(&doInventoryCb, (LLPointer)NULL, _1); AISAPI::UpdateCategory(getUUID(), new_llsd, cr); } @@ -879,7 +879,7 @@ void LLViewerInventoryCategory::changeType(LLFolderType::EType new_folder_type) LLSD new_llsd = new_cat->asLLSD(); - AISAPI::completion_t cr = boost::bind(&doInventoryCb, NULL, _1); + AISAPI::completion_t cr = boost::bind(&doInventoryCb, (LLPointer) NULL, _1); AISAPI::UpdateCategory(folder_id, new_llsd, cr); setPreferredType(new_folder_type); -- cgit v1.2.3