diff options
| author | angela <angela@lindenlab.com> | 2010-01-26 08:00:29 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-01-26 08:00:29 +0800 |
| commit | a358dc65c4fb7054bb5408f8b0d7424e7ca55eed (patch) | |
| tree | 0a05d568a498d746921354dd90cca5af492a5976 /indra/llui/lltextbase.cpp | |
| parent | c555e837b19fd876bf155d131c30942d27fc8364 (diff) | |
| parent | 66e7c2ce7715873bc29437878c5bce1ca0bee27b (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index a6e410d3e1..41ff462850 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2208,7 +2208,7 @@ void LLTextSegment::linkToDocument(LLTextBase*) {} const LLColor4& LLTextSegment::getColor() const { return LLColor4::white; } //void LLTextSegment::setColor(const LLColor4 &color) {} LLStyleConstSP LLTextSegment::getStyle() const {static LLStyleConstSP sp(new LLStyle()); return sp; } -void LLTextSegment::setStyle(LLStyleConstSP &style) {} +void LLTextSegment::setStyle(LLStyleConstSP style) {} void LLTextSegment::setToken( LLKeywordToken* token ) {} LLKeywordToken* LLTextSegment::getToken() const { return NULL; } void LLTextSegment::setToolTip( const std::string &msg ) {} @@ -2233,7 +2233,7 @@ BOOL LLTextSegment::hasMouseCapture() { return FALSE; } // LLNormalTextSegment // -LLNormalTextSegment::LLNormalTextSegment( LLStyleConstSP& style, S32 start, S32 end, LLTextBase& editor ) +LLNormalTextSegment::LLNormalTextSegment( LLStyleConstSP style, S32 start, S32 end, LLTextBase& editor ) : LLTextSegment(start, end), mStyle( style ), mToken(NULL), |