diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-05 15:02:36 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-05 15:02:36 -0400 |
| commit | 2eba9819df8c473137b0f45d5873794362b14562 (patch) | |
| tree | 000a2951c8f2724d17deb2beb6f8db9e76891b78 /indra/newview/llpanelobjectinventory.h | |
| parent | 9bfc1c3b1060f15990bba218795a1ef6009d1535 (diff) | |
EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefines
Took out enums and flags from LLInventory into LLInventoryDefines
Did a bunch of header file reformatting for LLInventory.h
Change made to simulator files as well.
Diffstat (limited to 'indra/newview/llpanelobjectinventory.h')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpanelobjectinventory.h b/indra/newview/llpanelobjectinventory.h index bc339ece35..d015929841 100644 --- a/indra/newview/llpanelobjectinventory.h +++ b/indra/newview/llpanelobjectinventory.h @@ -82,12 +82,12 @@ public: protected: void reset(); /*virtual*/ void inventoryChanged(LLViewerObject* object, - InventoryObjectList* inventory, + LLInventoryObject::object_list_t* inventory, S32 serial_num, void* user_data); void updateInventory(); - void createFolderViews(LLInventoryObject* inventory_root, InventoryObjectList& contents); - void createViewsForCategory(InventoryObjectList* inventory, + void createFolderViews(LLInventoryObject* inventory_root, LLInventoryObject::object_list_t& contents); + void createViewsForCategory(LLInventoryObject::object_list_t* inventory, LLInventoryObject* parent, LLFolderViewFolder* folder); void clearContents(); |