diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-02 16:22:18 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-02 16:22:18 -0500 |
| commit | 310a7b60f7d3af1e14cdd91c94e8a5841b182a4c (patch) | |
| tree | 13d1b6caea6c93169ee643ec3cff06a1d8a02d17 /indra/newview/llfloateropenobject.h | |
| parent | cdf639087011dc7f4510cedd9951e8d890818b97 (diff) | |
| parent | bde7d67066d189416a725da4527a02eb4f78ba4a (diff) | |
Merge conflict resolution for previous commit.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfloateropenobject.h')
| -rw-r--r-- | indra/newview/llfloateropenobject.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateropenobject.h b/indra/newview/llfloateropenobject.h index a61cc04941..10d96b7ea3 100644 --- a/indra/newview/llfloateropenobject.h +++ b/indra/newview/llfloateropenobject.h @@ -41,7 +41,7 @@ #include "llfloater.h" class LLObjectSelection; -class LLPanelInventory; +class LLPanelObjectInventory; class LLFloaterOpenObject : public LLFloater @@ -77,7 +77,7 @@ private: protected: - LLPanelInventory* mPanelInventory; + LLPanelObjectInventory* mPanelInventoryObject; LLSafeHandle<LLObjectSelection> mObjectSelection; BOOL mDirty; }; |