diff options
| author | richard <none@none> | 2010-02-01 12:39:59 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-02-01 12:39:59 -0800 |
| commit | 45e700cb3ef9c56aaf373a8b4acafb4fc07a5972 (patch) | |
| tree | 394d990d038387952d0668da989dd4d7da072c86 /indra/newview/llviewertexteditor.cpp | |
| parent | c339017d2e156a68f1e300a7668f2a9f6e6141f7 (diff) | |
| parent | f99a7b23ae0cee0d3e96b0b89d82e5c35bb07433 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index 2e92512b31..ea8af223c3 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -246,7 +246,7 @@ public: return FALSE; } - /*virtual*/ const LLStyleSP getStyle() const { return mStyle; } + /*virtual*/ LLStyleConstSP getStyle() const { return mStyle; } private: LLUIImagePtr mImage; |