diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 12:16:36 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 12:16:36 +0100 |
| commit | 8da371b0f08f92fb1fef083f0bfb526f0698afd7 (patch) | |
| tree | b2ca851a0ef32e0994fb151a5457e615b4ea69c2 /indra/newview/llfloaterbulkpermission.h | |
| parent | 1e7ae7a69398a1bca88812545da7bc86db9f3c38 (diff) | |
| parent | 244de628f2a71ea773cdcabb8328df26f20e3120 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterbulkpermission.h')
| -rw-r--r-- | indra/newview/llfloaterbulkpermission.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h index bffcff7059..80dc88fbb1 100644 --- a/indra/newview/llfloaterbulkpermission.h +++ b/indra/newview/llfloaterbulkpermission.h @@ -63,13 +63,13 @@ private: // This is the callback method for the viewer object currently // being worked on. /*virtual*/ void inventoryChanged(LLViewerObject* obj, - InventoryObjectList* inv, + LLInventoryObject::object_list_t* inv, S32 serial_num, void* queue); // This is called by inventoryChanged void handleInventory(LLViewerObject* viewer_obj, - InventoryObjectList* inv); + LLInventoryObject::object_list_t* inv); void updateInventory(LLViewerObject* object, |