diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-18 19:17:34 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-08-18 19:17:34 -0400 |
| commit | cb09994ae2a3d1d60a6554fea4c6a604b867c6eb (patch) | |
| tree | 676b7c68e0b0422c63e4cb6dbd5ccc1e55168e2f /indra/newview/llpanelmarketplaceinbox.h | |
| parent | cfe0a3cbe445900574b82e8c843bddc347f1b269 (diff) | |
| parent | 299a01470402de0327fc7f839e5937fc6b60bf63 (diff) | |
merging in latest mesh-development
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; |