diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-18 13:17:06 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-18 13:17:06 -0700 |
| commit | 18e5fa5bbd2f78b4fa6eee8b72666fa9aeb2100e (patch) | |
| tree | 2b18b184a4f6ea28db14ff796fb41ec300d8acd9 /indra/newview/llchathistory.cpp | |
| parent | 2301c7cff60eca879f605a3ee3f26b960597d8c3 (diff) | |
| parent | c43cfcdcbd243410e2f780f58f93100e96fc996c (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/llchathistory.cpp')
| -rw-r--r-- | indra/newview/llchathistory.cpp | 8 |
1 files changed, 8 insertions, 0 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(); |