diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-02 12:17:29 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-02 12:17:29 +0200 |
commit | 9b0518dd8e46dfe74eaa0f7622b1486dbde32b82 (patch) | |
tree | 2c637ad3b5a5cfa8ec1e97c30c3de9efe5cac59b /indra/llui/llviewmodel.h | |
parent | 7f83000ea13bac5b4cccb9a6f12e764ac8d69b2a (diff) | |
parent | 4ad357ec70e15afdfe78816990cb23c7ba17619c (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llviewmodel.h')
-rw-r--r-- | indra/llui/llviewmodel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llviewmodel.h b/indra/llui/llviewmodel.h index c8a9b52cca..992365d44d 100644 --- a/indra/llui/llviewmodel.h +++ b/indra/llui/llviewmodel.h @@ -107,7 +107,8 @@ public: // New functions /// Get the stored value in string form - LLWString getDisplay() const { return mDisplay; } + const LLWString& getDisplay() const { return mDisplay; } + /** * Set the display string directly (see LLTextEditor). What the user is * editing is actually the LLWString value rather than the underlying |