From 48c7e2cee70996048b0974c6cdda67cdea11a32c Mon Sep 17 00:00:00 2001 From: "Jeff (Gioffredo Linden)" Date: Fri, 12 Oct 2012 18:14:57 -0400 Subject: Expose Chat history to VITA by adding getValue method to llchathistory object --- indra/newview/llchathistory.cpp | 8 ++++++++ indra/newview/llchathistory.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 3636f9e9d2..deb658c489 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -596,6 +596,14 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) mEditor = LLUICtrlFactory::create(editor_params, this); } +LLSD LLChatHistory::getValue() +{ + 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..fa88483fcd 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - + LLSD getVlue(); void initFromParams(const Params&); /** -- cgit v1.2.3 From 5f4fbffc82ae755235ead5e1b5883cc909e77e77 Mon Sep 17 00:00:00 2001 From: "Jeff (Gioffredo Linden)" Date: Fri, 12 Oct 2012 20:30:06 -0400 Subject: Fix typo --- indra/newview/llchathistory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index fa88483fcd..effdd75911 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - LLSD getVlue(); + LLSD getValue(); void initFromParams(const Params&); /** -- cgit v1.2.3 From 337cd3aa9d8a8beaebd35ec6b53f09709e35a4d4 Mon Sep 17 00:00:00 2001 From: "Jeff (Gioffredo Linden)" Date: Tue, 16 Oct 2012 15:22:42 -0400 Subject: Make getValue const to fix Windows builds - and be more robust --- indra/newview/llchathistory.cpp | 2 +- indra/newview/llchathistory.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index deb658c489..821d1f4685 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -596,7 +596,7 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) mEditor = LLUICtrlFactory::create(editor_params, this); } -LLSD LLChatHistory::getValue() +const LLSD LLChatHistory::getValue() { LLSD* text=new LLSD(); text->assign(mEditor->getText()); diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index effdd75911..b65d222b53 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - LLSD getValue(); + const LLSD getValue(); void initFromParams(const Params&); /** -- cgit v1.2.3 From 86c3a45b6749387991064df6a42b1d046bd9d4d8 Mon Sep 17 00:00:00 2001 From: "Jeff (Gioffredo Linden)" Date: Tue, 16 Oct 2012 16:08:25 -0400 Subject: Move const kw location --- indra/newview/llchathistory.cpp | 2 +- indra/newview/llchathistory.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index 821d1f4685..c61a8c8562 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -596,7 +596,7 @@ LLChatHistory::LLChatHistory(const LLChatHistory::Params& p) mEditor = LLUICtrlFactory::create(editor_params, this); } -const LLSD LLChatHistory::getValue() +LLSD LLChatHistory::getValue() const { LLSD* text=new LLSD(); text->assign(mEditor->getText()); diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index b65d222b53..bb6d4fb59c 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -103,7 +103,7 @@ class LLChatHistory : public LLUICtrl public: ~LLChatHistory(); - const LLSD getValue(); + LLSD getValue() const; void initFromParams(const Params&); /** -- cgit v1.2.3