diff options
| author | richard <none@none> | 2010-01-22 17:40:28 -0800 |
|---|---|---|
| committer | richard <none@none> | 2010-01-22 17:40:28 -0800 |
| commit | 947398563e8082fae2583d2749b69ad16611eae5 (patch) | |
| tree | 61aab38a32e6822d96cc8efe094d41f89b378861 /indra/newview/llviewertexteditor.cpp | |
| parent | fa891c062ef66410123c66de1ef67b7dcef327db (diff) | |
| parent | 955c0cc5a9ab8fb9eda7a6c20cd7bd09c2fd9369 (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; |