summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmarketplaceoutbox.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-15 16:22:03 -0400
committerOz Linden <oz@lindenlab.com>2011-08-15 16:22:03 -0400
commitb8320207bb911a311a498426fdd4a987dd7748ea (patch)
tree37c5c4795916fd9787014e9e39727e39727f3482 /indra/newview/llpanelmarketplaceoutbox.h
parent45036820f85844093f3a2031cff10c6633926da4 (diff)
parent25f1653ca0a25c73b3c0649ee5bb7c65e5378eac (diff)
merge changes for storm-1557
Diffstat (limited to 'indra/newview/llpanelmarketplaceoutbox.h')
-rw-r--r--indra/newview/llpanelmarketplaceoutbox.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmarketplaceoutbox.h b/indra/newview/llpanelmarketplaceoutbox.h
index 1b502127ef..8e2c35914d 100644
--- a/indra/newview/llpanelmarketplaceoutbox.h
+++ b/indra/newview/llpanelmarketplaceoutbox.h
@@ -54,7 +54,7 @@ public:
/*virtual*/ BOOL postBuild();
- void setupInventoryPanel();
+ LLInventoryPanel * setupInventoryPanel();
bool isOutboxEmpty() const;
bool isSyncInProgress() const;