diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 15:57:01 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-08-02 15:57:01 -0700 |
| commit | 4f6e814eaa7ae5cfc10e4e7d1f22e53be395a2f4 (patch) | |
| tree | be554f9f22996e00dada6da67f7e77eb0502b0f5 /indra/newview/llappviewer.cpp | |
| parent | f423a69864c40f760c1c7e64a2e544fd1dba77fb (diff) | |
| parent | 15247f086989a43881d79c1ee5416bb00721eb68 (diff) | |
Fix the reversion imported from viewer-hotfix via: "hg pull -r 1c95812ba38b ../viewer-public" - reviewed by richard
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 58b651ec39..682e3eb874 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -45,7 +45,6 @@ #include "llgroupmgr.h" #include "llagent.h" #include "llagentcamera.h" -#include "llagentlanguage.h" #include "llagentwearables.h" #include "llwindow.h" #include "llviewerstats.h" @@ -357,7 +356,7 @@ static void ui_audio_callback(const LLUUID& uuid) bool create_text_segment_icon_from_url_match(LLUrlMatch* match,LLTextBase* base) { - if(!match || !base || base->getPlainText()) + if(!match || !base) return false; LLUUID match_id = match->getID(); @@ -386,7 +385,7 @@ bool create_text_segment_icon_from_url_match(LLUrlMatch* match,LLTextBase* base) params.view = icon; params.left_pad = 4; params.right_pad = 4; - params.top_pad = -2; + params.top_pad = 2; params.bottom_pad = 2; base->appendWidget(params," ",false); @@ -947,8 +946,6 @@ bool LLAppViewer::init() LLStringOps::sPM = LLTrans::getString("dateTimePM"); } - LLAgentLanguage::init(); - return true; } |