diff options
author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-07-07 00:15:41 +0300 |
---|---|---|
committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-07-07 00:15:41 +0300 |
commit | c7c8fac310eef7921741b33f815622f9ddcf2247 (patch) | |
tree | 451704d2712e2632768bec8b5e732ccdaf4e9e1d /indra/newview/llinventorymodel.h | |
parent | 33be227716b0fa675f010555e753f45adb746971 (diff) | |
parent | f868e29945806fd6cefde65067ae2c870ac112a6 (diff) |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r-- | indra/newview/llinventorymodel.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index 3004eaf7c1..826d1f880d 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -630,9 +630,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); |