diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:50:24 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2009-10-05 15:50:24 -0700 |
| commit | 39ee2367a7e771890017fc3d663780437ea69bb2 (patch) | |
| tree | b84c3ade59dba5ae032a3123afb9c3c5f78c9b68 /indra/newview/llnetmap.cpp | |
| parent | 374deb8da13c63f80dc1b245488eb254eb86f5d2 (diff) | |
| parent | 6ef3f20933c5df684298bc1b8f338ce9dfd49070 (diff) | |
Merging due to changes since my last pull.
Diffstat (limited to 'indra/newview/llnetmap.cpp')
| -rw-r--r-- | indra/newview/llnetmap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llnetmap.cpp b/indra/newview/llnetmap.cpp index 5e65f2244d..bd6e6cd0cb 100644 --- a/indra/newview/llnetmap.cpp +++ b/indra/newview/llnetmap.cpp @@ -500,7 +500,7 @@ BOOL LLNetMap::handleScrollWheel(S32 x, S32 y, S32 clicks) return TRUE; } -BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect& sticky_rect_screen ) +BOOL LLNetMap::handleToolTip( S32 x, S32 y, MASK mask ) { if (gDisconnected) { @@ -530,7 +530,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect& sticky_rec args["[REGION]"] = ""; } - msg = mToolTipMsg; + std::string msg = mToolTipMsg; LLStringUtil::format(msg, args); LLRect sticky_rect; @@ -545,7 +545,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect& sticky_rec sticky_rect.mTop = sticky_rect.mBottom + 2 * SLOP; } - LLToolTipMgr::instance().show(LLToolTipParams() + LLToolTipMgr::instance().show(LLToolTip::Params() .message(msg) .sticky_rect(sticky_rect)); |