diff options
| author | richard <none@none> | 2010-02-01 13:51:37 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-02-01 13:51:37 -0800 |
| commit | 7855785caa94b3c14b1bd52d1d1daf780d9a100b (patch) | |
| tree | 5af3b6371ab92b36b3611de2c19da82cb4b2ac30 /indra/newview/llviewertexteditor.cpp | |
| parent | 5fe9863ff51d52df4a9ab6f6281fd16e6ef029db (diff) | |
| parent | 08adb4cfed36b6eda2446c3454637f3ac0a644e6 (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; |