diff options
| author | callum <none@none> | 2012-01-27 13:18:56 -0800 |
|---|---|---|
| committer | callum <none@none> | 2012-01-27 13:18:56 -0800 |
| commit | f53a72ec2c40ae04cee6dee2f58d76c5fedeca99 (patch) | |
| tree | e09f6db35a7c2f70fd8cdc45e105aec0f4bea9e0 /indra/newview/llinventorybridge.h | |
| parent | 987463d9248d7fab9534ff7a9f303c6db42da7a9 (diff) | |
| parent | 13d510d5f2fa2d9bf654e70d9191f1909b1f299e (diff) | |
Merge with head
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; |