diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-07-02 00:38:13 +0000 |
| commit | 39905b927d60e204438705728d2c214cb3f9ef81 (patch) | |
| tree | 7bb617cc204514b233e081457d905693aa0ae409 /indra/newview/llpanelplaceinfo.h | |
| parent | 687cff0eb8dfe663b99e18cfd953e0764d8ab372 (diff) | |
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4
Diffstat (limited to 'indra/newview/llpanelplaceinfo.h')
| -rw-r--r-- | indra/newview/llpanelplaceinfo.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h index f88e29bc91..cec9e7b80c 100644 --- a/indra/newview/llpanelplaceinfo.h +++ b/indra/newview/llpanelplaceinfo.h @@ -1,5 +1,5 @@ /** - * @file llpanelplace.h + * @file llpanelplaceinfo.h * @brief Displays place information in Side Tray. * * $LicenseInfo:firstyear=2009&license=viewergpl$ @@ -43,11 +43,11 @@ #include "llremoteparcelrequest.h" class LLButton; -class LLTextBox; +class LLInventoryItem; class LLLineEditor; +class LLTextBox; class LLTextEditor; class LLTextureCtrl; -class LLInventoryItem; class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver { @@ -77,6 +77,7 @@ public: const std::string& last); /*virtual*/ void processParcelInfo(const LLParcelData& parcel_data); + /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); private: enum LANDMARK_INFO_TYPE @@ -102,8 +103,10 @@ private: LLTextBox* mCreated; LLLineEditor* mTitleEditor; LLTextEditor* mNotesEditor; - LLTextBox* mLocationEditor; + LLTextBox* mLocationEditor; + LLPanel* mScrollingPanel; LLPanel* mInfoPanel; + S32 mMinHeight; }; #endif // LL_LLPANELPLACEINFO_H |