diff options
Diffstat (limited to 'indra/newview/lllocationinputctrl.h')
| -rw-r--r-- | indra/newview/lllocationinputctrl.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h index fefd0f7fec..608176290e 100644 --- a/indra/newview/lllocationinputctrl.h +++ b/indra/newview/lllocationinputctrl.h @@ -35,6 +35,7 @@ #include "llcombobox.h" #include "lliconctrl.h" // Params +#include "lltextbox.h" // Params class LLLandmark; @@ -64,7 +65,8 @@ public: add_landmark_image_disabled, add_landmark_image_hover, add_landmark_image_selected; - Optional<S32> icon_hpad; + Optional<S32> icon_hpad, + add_landmark_hpad; Optional<LLButton::Params> add_landmark_button, info_button; Optional<LLIconCtrl::Params> voice_icon, @@ -73,6 +75,7 @@ public: build_icon, scripts_icon, damage_icon; + Optional<LLTextBox::Params> damage_text; Params(); }; @@ -111,6 +114,9 @@ private: void refresh(); void refreshLocation(); void refreshParcelIcons(); + // Refresh the value in the health percentage text field + void refreshHealth(); + void rebuildLocationHistory(std::string filter = ""); bool findTeleportItemsByTitle(const LLTeleportHistoryItem& item, const std::string& filter); void setText(const LLStringExplicit& text); @@ -134,7 +140,8 @@ private: LLMenuGL* mLocationContextMenu; LLButton* mAddLandmarkBtn; LLButton* mInfoBtn; - S32 mIconHPad; + S32 mIconHPad; // pad between all icons + S32 mAddLandmarkHPad; // pad to left of landmark star enum EParcelIcon { @@ -147,7 +154,7 @@ private: ICON_COUNT }; LLIconCtrl* mParcelIcon[ICON_COUNT]; - // TODO: Health meter? + LLTextBox* mDamageText; LLAddLandmarkObserver* mAddLandmarkObserver; LLRemoveLandmarkObserver* mRemoveLandmarkObserver; |