From f26f7e3e29019abf3a10f6925e30baca19eb4e2d Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Wed, 8 Jul 2009 05:19:19 +0000 Subject: merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> viewer-2-0 Also: * Moved media remote shortcut to Communicate menu * Changed mini map menu to toggle instead of show --- indra/newview/llpanelplaceinfo.h | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) (limited to 'indra/newview/llpanelplaceinfo.h') diff --git a/indra/newview/llpanelplaceinfo.h b/indra/newview/llpanelplaceinfo.h index cec9e7b80c..8b00507ba0 100644 --- a/indra/newview/llpanelplaceinfo.h +++ b/indra/newview/llpanelplaceinfo.h @@ -40,6 +40,7 @@ #include "lliconctrl.h" +#include "llpanelmedia.h" #include "llremoteparcelrequest.h" class LLButton; @@ -52,19 +53,31 @@ class LLTextureCtrl; class LLPanelPlaceInfo : public LLPanel, LLRemoteParcelInfoObserver { public: + enum INFO_TYPE + { + PLACE, + LANDMARK + }; + LLPanelPlaceInfo(); /*virtual*/ ~LLPanelPlaceInfo(); /*virtual*/ BOOL postBuild(); + // Ignore all old location information, useful if you are + // recycling an existing dialog and need to clear it. void resetLocation(); - // Ignore all old location information, useful if you are - // recycling an existing dialog and need to clear it. + // Sends a request for data about the given parcel, which will + // only update the location if there is none already available. /*virtual*/ void setParcelID(const LLUUID& parcel_id); - // Sends a request for data about the given parcel, which will - // only update the location if there is none already available. + // Depending on how the panel was triggered + // (from landmark or current location, or other) + // sets a corresponding title and contents. + void setInfoType(INFO_TYPE type); + + void toggleMediaPanel(); void displayItemInfo(const LLInventoryItem* pItem); /*virtual*/ void setErrorStatus(U32 status, const std::string& reason); @@ -81,10 +94,10 @@ public: private: enum LANDMARK_INFO_TYPE - { - TITLE, - NOTE - }; + { + TITLE, + NOTE + }; void onCommitTitleOrNote(LANDMARK_INFO_TYPE type); @@ -92,7 +105,10 @@ private: LLUUID mRequestedID; LLUUID mLandmarkID; LLVector3 mPosRegion; + std::string mCurrentTitle; + S32 mMinHeight; + LLTextBox* mTitle; LLTextureCtrl* mSnapshotCtrl; LLTextBox* mRegionName; LLTextBox* mParcelName; @@ -106,7 +122,7 @@ private: LLTextBox* mLocationEditor; LLPanel* mScrollingPanel; LLPanel* mInfoPanel; - S32 mMinHeight; + LLMediaPanel* mMediaPanel; }; #endif // LL_LLPANELPLACEINFO_H -- cgit v1.2.3