diff options
author | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-08-15 16:35:41 -0400 |
commit | cb957d3dabfd0a419cb70461cc5bf3af2adba7a3 (patch) | |
tree | ac9978539aa02d80bf8c026aa3b2e1ba85404ecf /indra/newview/llpanelmarketplaceinbox.h | |
parent | 7819b49086729187e198bf69f9c45f1c63f11ff2 (diff) | |
parent | b8320207bb911a311a498426fdd4a987dd7748ea (diff) |
merge late 3.0.1 beta candidate fixes
Diffstat (limited to 'indra/newview/llpanelmarketplaceinbox.h')
-rw-r--r-- | indra/newview/llpanelmarketplaceinbox.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmarketplaceinbox.h b/indra/newview/llpanelmarketplaceinbox.h index 4ecea29304..7b4ed137db 100644 --- a/indra/newview/llpanelmarketplaceinbox.h +++ b/indra/newview/llpanelmarketplaceinbox.h @@ -55,7 +55,7 @@ public: /*virtual*/ void draw(); - void setupInventoryPanel(); + LLInventoryPanel * setupInventoryPanel(); U32 getFreshItemCount() const; U32 getTotalItemCount() const; |