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/llfloaterbuy.h | |
parent | 1e7ae7a69398a1bca88812545da7bc86db9f3c38 (diff) | |
parent | 244de628f2a71ea773cdcabb8328df26f20e3120 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterbuy.h')
-rw-r--r-- | indra/newview/llfloaterbuy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h index ab38e082dc..411c8fb00e 100644 --- a/indra/newview/llfloaterbuy.h +++ b/indra/newview/llfloaterbuy.h @@ -65,7 +65,7 @@ protected: void requestObjectInventories(); /*virtual*/ void inventoryChanged(LLViewerObject* obj, - InventoryObjectList* inv, + LLInventoryObject::object_list_t* inv, S32 serial_num, void* data); |