From 7fc3d509ea41522382448be5caac9388827b5859 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 14 Jul 2010 11:35:20 -0700
Subject: potentially unsafe storage of raw pointer to LLViewerObject
---
indra/newview/llsidepaneltaskinfo.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra')
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;
};
--
cgit v1.2.3
From 1d1377079b08ada11bc33cc88ee25761b1954d5c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Wed, 14 Jul 2010 11:48:33 -0700
Subject: EXT-8300 FIX Creator's icon overlaps description text on object's
mini-inspector reviewed by Leyla
---
indra/llui/lltextbase.cpp | 12 +++++++++---
indra/newview/llappviewer.cpp | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
(limited to 'indra')
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index ed03645944..d3b2a368a5 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -2282,6 +2282,12 @@ void LLTextBase::updateRects()
? llmax(mVisibleTextRect.getWidth(), mTextBoundingRect.mRight)
: mVisibleTextRect.getWidth();
+ if (!mScroller)
+ {
+ // push doc rect to top of text widget
+ doc_rect.translate(0, mVisibleTextRect.getHeight() - doc_rect.mTop);
+ }
+
mDocumentView->setShape(doc_rect);
//update mVisibleTextRect *after* mDocumentView has been resized
@@ -2786,9 +2792,9 @@ F32 LLLineBreakTextSegment::draw(S32 start, S32 end, S32 selection_start, S32 se
}
LLImageTextSegment::LLImageTextSegment(LLStyleConstSP style,S32 pos,class LLTextBase& editor)
- :LLTextSegment(pos,pos+1)
- ,mStyle( style )
- ,mEditor(editor)
+: LLTextSegment(pos,pos+1),
+ mStyle( style ),
+ mEditor(editor)
{
}
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 682e3eb874..d8b2866a9f 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);
--
cgit v1.2.3