diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-05 12:37:26 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-05 12:37:26 +0200 |
| commit | ddf2cccdb926ca2aac226a90c4030f2d4e8c6f50 (patch) | |
| tree | a1d7fe2f014b70e5b0d5fe3419b4e5eb85c0de48 /indra/newview/llsidepaneliteminfo.h | |
| parent | 3c5976981dd06ccca45d9d2b9024a6c72fd7ea49 (diff) | |
| parent | b282f04b31f60a3ddd9dcbd27eed2d2226a40e09 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.h')
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h index 21002327bc..e6dbf400ee 100644 --- a/indra/newview/llsidepaneliteminfo.h +++ b/indra/newview/llsidepaneliteminfo.h @@ -41,7 +41,7 @@ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ class LLButton; -class LLInventoryItem; +class LLViewerInventoryItem; class LLItemPropertiesObserver; class LLViewerObject; class LLPermissions; @@ -63,10 +63,10 @@ protected: /*virtual*/ void refresh(); /*virtual*/ void save(); - LLInventoryItem* findItem() const; + LLViewerInventoryItem* findItem() const; LLViewerObject* findObject() const; - void refreshFromItem(LLInventoryItem* item); + void refreshFromItem(LLViewerInventoryItem* item); private: LLUUID mItemID; // inventory UUID for the inventory item. |