diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2011-08-12 14:53:25 -0700 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2011-08-12 14:53:25 -0700 |
commit | 10ec0049125317d5c0bdd1bf89b96a54a9b2d873 (patch) | |
tree | 97efa1a6731aef7e703e1a6ca2eaa4a01dbb6fa8 /indra/newview/llpanelmarketplaceoutbox.h | |
parent | e69efc8369a65008d41155717761fbaec0e309c5 (diff) | |
parent | 25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff) |
merge from viewer-experience
Diffstat (limited to 'indra/newview/llpanelmarketplaceoutbox.h')
-rw-r--r-- | indra/newview/llpanelmarketplaceoutbox.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmarketplaceoutbox.h b/indra/newview/llpanelmarketplaceoutbox.h index b5ee3f72cc..c2f368ea7b 100644 --- a/indra/newview/llpanelmarketplaceoutbox.h +++ b/indra/newview/llpanelmarketplaceoutbox.h @@ -56,7 +56,7 @@ public: /*virtual*/ void draw(); - void setupInventoryPanel(); + LLInventoryPanel * setupInventoryPanel(); U32 getTotalItemCount() const; |