diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-20 11:30:21 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-20 11:30:21 -0700 |
| commit | 99176071bff5313b7e1713205746c14a77d4140f (patch) | |
| tree | dee10a71f3d47630c48db9fb421d8a05c11501a4 /indra/newview | |
| parent | d603085c0332f5d615cc6583e13ed0aa5ab21908 (diff) | |
| parent | 1d1377079b08ada11bc33cc88ee25761b1954d5c (diff) | |
Merge from q/viewer-release just picking up 13634 (39cb633321ed) for the creator icon fix
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsidepaneltaskinfo.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3d10db7bed..2969a1676e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -385,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); diff --git a/indra/newview/llsidepaneltaskinfo.h b/indra/newview/llsidepaneltaskinfo.h index 010173e84e..99d0603ec5 100644 --- a/indra/newview/llsidepaneltaskinfo.h +++ b/indra/newview/llsidepaneltaskinfo.h @@ -121,7 +121,7 @@ private: protected: LLViewerObject* getObject(); private: - LLViewerObject* mObject; + LLPointer<LLViewerObject> mObject; LLObjectSelectionHandle mObjectSelection; static LLSidepanelTaskInfo* sActivePanel; }; |