diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-10 17:52:28 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-10 17:52:28 -0800 |
| commit | 98ca90bed46591573f5072121a774d19cc69381f (patch) | |
| tree | e11d8e8b4459b8513c0495f76932c71385b1e062 /indra/newview/llpanelplaceinfo.h | |
| parent | 04eaf3f34fbc0b2ba7f6dd22600e8df1aaa63ed8 (diff) | |
| parent | 2857dd026ce67f26f4da2f07ecffd8d6b754625c (diff) | |
Merge changes from product-engine
Diffstat (limited to 'indra/newview/llpanelplaceinfo.h')
| -rw-r--r-- | indra/newview/llpanelplaceinfo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h index ec30397cff..133933a880 100644 --- a/indra/newview/llpanelplaceinfo.h +++ b/indra/newview/llpanelplaceinfo.h @@ -41,6 +41,7 @@ #include "llremoteparcelrequest.h" class LLExpandableTextBox; +class LLIconCtrl; class LLInventoryItem; class LLPanelPickEdit; class LLParcel; @@ -109,7 +110,6 @@ protected: LLUUID mRequestedID; LLVector3 mPosRegion; std::string mCurrentTitle; - S32 mMinHeight; INFO_TYPE mInfoType; LLTextBox* mTitle; @@ -117,6 +117,7 @@ protected: LLTextBox* mRegionName; LLTextBox* mParcelName; LLExpandableTextBox* mDescEditor; + LLIconCtrl* mMaturityRatingIcon; LLTextBox* mMaturityRatingText; }; |