diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-16 16:42:45 -0700 |
commit | 3e10fa4d51a23bf6f1ced23e8d90c636d84fa5db (patch) | |
tree | d4991e4c1a9dd934f48d33804e55eb8ffa085679 /indra/newview/lllocationinputctrl.h | |
parent | e9f7205ba9f4dfb3422759218609b62d61972722 (diff) | |
parent | f20e9521a9b70f4e83cbb6888feae08a70681ea7 (diff) |
merge from latest svn/viewer-2-0 to hg/viewer-2-0
Diffstat (limited to 'indra/newview/lllocationinputctrl.h')
-rw-r--r-- | indra/newview/lllocationinputctrl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lllocationinputctrl.h b/indra/newview/lllocationinputctrl.h index c74a294ca3..cd5c482005 100644 --- a/indra/newview/lllocationinputctrl.h +++ b/indra/newview/lllocationinputctrl.h @@ -66,6 +66,8 @@ public: Optional<S32> add_landmark_hpad; Optional<LLButton::Params> add_landmark_button, info_button; + Optional<std::string> add_landmark_tool_tip; + Optional<std::string> edit_landmark_tool_tip; Params(); }; |