diff options
| author | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-06 15:28:45 -0800 |
| commit | 2ed1de224a45fafb12fea42e8dfb83f9728cdcf1 (patch) | |
| tree | a78f96c5ada866ec93cbba72f2c7bf1daf7ade80 /indra/newview/llinventorybridge.h | |
| parent | 289d756ea86bd3898f41592146d8f549cd056846 (diff) | |
| parent | e328dcf4062177c903d3099d0d16477824d23025 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index 871657a58a..3bcd71557c 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -161,7 +161,7 @@ protected: BOOL restamp); void removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener*>& batch); protected: - LLHandle<LLPanel> mInventoryPanel; + LLHandle<LLInventoryPanel> mInventoryPanel; LLFolderView* mRoot; const LLUUID mUUID; // item id LLInventoryType::EType mInvType; |