diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-18 11:16:51 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-18 11:16:51 -0700 |
| commit | f9c068462f379a4678e59090a066cfa173504c6b (patch) | |
| tree | 1e52dc01a20a440cfc07f617ad90e04f16f85c5b | |
| parent | ec9260701feaa9ae1453c57f0f70449bb9b60af2 (diff) | |
| parent | 86c3a45b6749387991064df6a42b1d046bd9d4d8 (diff) | |
CHUI-431 : Merge of VITA changes
| -rw-r--r-- | indra/newview/llchathistory.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llchathistory.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 3636f9e9d2..c61a8c8562 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -596,6 +596,14 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) mEditor = LLUICtrlFactory::create<LLTextEditor>(editor_params, this); } +LLSD LLChatHistory::getValue() const +{ + LLSD* text=new LLSD(); + text->assign(mEditor->getText()); + return *text; + +} + LLChatHistory::~LLChatHistory() { this->clear(); diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 990c52f31b..bb6d4fb59c 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - + LLSD getValue() const; void initFromParams(const Params&); /** |