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/llinventorymodel.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llinventorymodel.h') diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index e1e6db19eb..bfa56bcec0 100755 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -623,9 +623,7 @@ public: static void processRemoveInventoryObjects(LLMessageSystem* msg, void**); static void processSaveAssetIntoInventory(LLMessageSystem* msg, void**); static void processBulkUpdateInventory(LLMessageSystem* msg, void**); - static void processInventoryDescendents(LLMessageSystem* msg, void**); static void processMoveInventoryItem(LLMessageSystem* msg, void**); - static void processFetchInventoryReply(LLMessageSystem* msg, void**); protected: bool messageUpdateCore(LLMessageSystem* msg, bool do_accounting, U32 mask = 0x0); -- cgit v1.2.3