diff options
| author | simon <none@none> | 2014-04-21 12:36:35 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-04-21 12:36:35 -0700 |
| commit | 0b9a777bfd3c85390c55d91fc3dc5c4bee9bf71b (patch) | |
| tree | dd3f484813df4f1a74a525f3f6dddcbc91beac7c /indra/newview/llsidepanelinventory.h | |
| parent | e606b7918dc6dbe2a4048f4bbd8590bfc3eca90e (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merge downstream code updating version to 3.7.7
Diffstat (limited to 'indra/newview/llsidepanelinventory.h')
| -rwxr-xr-x | indra/newview/llsidepanelinventory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llsidepanelinventory.h b/indra/newview/llsidepanelinventory.h index e8b2808d4f..17a3098db9 100755 --- a/indra/newview/llsidepanelinventory.h +++ b/indra/newview/llsidepanelinventory.h @@ -57,7 +57,7 @@ public: /*virtual*/ void onOpen(const LLSD& key); LLInventoryPanel* getActivePanel(); // Returns an active inventory panel, if any. - LLInventoryPanel* getInboxPanel() const { return mInventoryPanelInbox; } + LLInventoryPanel* getInboxPanel() const { return mInventoryPanelInbox.get(); } LLPanelMainInventory* getMainInventoryPanel() const { return mPanelMainInventory; } BOOL isMainInventoryPanelActive() const; @@ -99,7 +99,7 @@ protected: // private: LLPanel* mInventoryPanel; // Main inventory view - LLInventoryPanel* mInventoryPanelInbox; + LLHandle<LLInventoryPanel> mInventoryPanelInbox; LLSidepanelItemInfo* mItemPanel; // Individual item view LLSidepanelTaskInfo* mTaskPanel; // Individual in-world object view LLPanelMainInventory* mPanelMainInventory; |