diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-07-23 10:13:11 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-07-23 10:13:11 -0400 |
commit | 056685d9d4ac82aad45e46ae5d5226690d416513 (patch) | |
tree | 7f20ea566ee324303582b83c62530b6fa7d7bf98 /indra/newview/llworldmap.h | |
parent | 75cfa9a0c3c15e3a472a4c4fd2462402a3a766a0 (diff) | |
parent | 77911533dc68731f50f40b18cd44e287df28f476 (diff) |
automated merge
Diffstat (limited to 'indra/newview/llworldmap.h')
-rw-r--r-- | indra/newview/llworldmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llworldmap.h b/indra/newview/llworldmap.h index e4e677eb64..b97e5249e1 100644 --- a/indra/newview/llworldmap.h +++ b/indra/newview/llworldmap.h @@ -52,7 +52,7 @@ public: LLItemInfo(F32 global_x, F32 global_y, const std::string& name, LLUUID id); // Setters - void setTooltip(std::string& tooltip) { mToolTip = tooltip; } + void setTooltip(const std::string& tooltip) { mToolTip = tooltip; } void setElevation(F64 z) { mPosGlobal.mdV[VZ] = z; } void setCount(S32 count) { mCount = count; } // void setSelected(bool selected) { mSelected = selected; } |