From 104b117154022da6ec8e54bea04ff76e5692f93a Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Thu, 31 Mar 2016 15:26:53 -0700 Subject: Faster to copy changes than merge branches. --- indra/newview/llviewerinventory.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llviewerinventory.h') diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 4e91e4110a..9c2a640a1a 100755 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -387,9 +387,9 @@ void update_inventory_item( LLPointer cb); void update_inventory_category( - const LLUUID& cat_id, - const LLSD& updates, - LLPointer cb); + const LLUUID& cat_id, + const LLSD& updates, + LLPointer cb); void remove_inventory_items( LLInventoryObject::object_list_t& items, -- cgit v1.2.3 From 1337bff4acc8b53b29bcbe1203c620b9b0fb3b09 Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Thu, 31 Mar 2016 16:42:18 -0700 Subject: Needs prototype. --- indra/newview/llviewerinventory.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llviewerinventory.h') diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h index 9c2a640a1a..5194679a0c 100755 --- a/indra/newview/llviewerinventory.h +++ b/indra/newview/llviewerinventory.h @@ -38,6 +38,7 @@ class LLInventoryPanel; class LLFolderView; class LLFolderBridge; class LLViewerInventoryCategory; +class LLInventoryCallback; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Class LLViewerInventoryItem -- cgit v1.2.3