diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-02 17:15:46 -0500 |
| commit | f22fc1e6129a7e56421a0777d69c64265d9ec4af (patch) | |
| tree | 43dc78b1795ef407db7b9124472626fa77ae6621 /indra/newview/llinspectremoteobject.cpp | |
| parent | 847a3a12208359653aa7432f7f64c31669ec8963 (diff) | |
| parent | e3344abb95802646912f357d214538966f3f2357 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llinspectremoteobject.cpp')
| -rw-r--r-- | indra/newview/llinspectremoteobject.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llinspectremoteobject.cpp b/indra/newview/llinspectremoteobject.cpp index 898f1cd9ac..66e4a1bf66 100644 --- a/indra/newview/llinspectremoteobject.cpp +++ b/indra/newview/llinspectremoteobject.cpp @@ -167,7 +167,8 @@ void LLInspectRemoteObject::nameCallback(const LLUUID& id, const std::string& fi void LLInspectRemoteObject::update() { // show the object name as the inspector's title - getChild<LLUICtrl>("object_name")->setValue(mName); + // (don't hyperlink URLs in object names) + getChild<LLUICtrl>("object_name")->setValue("<nolink>" + mName + "</nolink>"); // show the object's owner - click it to show profile std::string owner = mOwner; @@ -192,7 +193,7 @@ void LLInspectRemoteObject::update() std::string url; if (! mSLurl.empty()) { - std::string url = "secondlife:///app/teleport/" + mSLurl; + url = "secondlife:///app/teleport/" + mSLurl; } getChild<LLUICtrl>("object_slurl")->setValue(url); |