From 03e965a7324ca9ecc3d99faf27e2ea4d7b2fbc52 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 15 Sep 2011 16:16:33 -0700
Subject: EXP-974 FIX Inventory Keystroke Behavior No Longer Working

---
 indra/llui/llscrollcontainer.cpp | 9 +++++++++
 indra/llui/llscrollcontainer.h   | 1 +
 2 files changed, 10 insertions(+)

(limited to 'indra/llui')

diff --git a/indra/llui/llscrollcontainer.cpp b/indra/llui/llscrollcontainer.cpp
index b44b4c36b6..fe3f688fc5 100644
--- a/indra/llui/llscrollcontainer.cpp
+++ b/indra/llui/llscrollcontainer.cpp
@@ -223,6 +223,15 @@ BOOL LLScrollContainer::handleKeyHere(KEY key, MASK mask)
 	return FALSE;
 }
 
+BOOL LLScrollContainer::handleUnicodeCharHere(llwchar uni_char)
+{
+	if (mScrolledView && mScrolledView->handleUnicodeCharHere(uni_char))
+	{
+		return TRUE;
+	}
+	return FALSE;
+}
+
 BOOL LLScrollContainer::handleScrollWheel( S32 x, S32 y, S32 clicks )
 {
 	// Give event to my child views - they may have scroll bars
diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h
index 46a71a7e30..3aa79cc255 100644
--- a/indra/llui/llscrollcontainer.h
+++ b/indra/llui/llscrollcontainer.h
@@ -103,6 +103,7 @@ public:
 	// LLView functionality
 	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
+	virtual BOOL	handleUnicodeCharHere(llwchar uni_char);
 	virtual BOOL	handleScrollWheel( S32 x, S32 y, S32 clicks );
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 								   EDragAndDropType cargo_type,
-- 
cgit v1.2.3


From 8b7f4d4ea38175ad1ee6cd0fe7d478d1802876c1 Mon Sep 17 00:00:00 2001
From: Vadim ProductEngine <vsavchuk@productengine.com>
Date: Fri, 16 Sep 2011 19:09:37 +0300
Subject: STORM-1600 FIXED Folder view stole "Delete" key presses from the line
 editor when renaming a newly created inventory item.

Reason:
LLFocusMgr::setKeyboardFocus() which is called from LLLineEditor::setFocus()
makes the folder view the edit menu handler, thus it receives the Delete key
presses instead of the line editor.

Fix:
Make sure the line editor becomes the edit menu handler whenever it's focused,
no matter is it a child of a folder view or not.
---
 indra/llui/lllineeditor.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llui')

diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp
index ebdd47ae80..06dfc90d83 100644
--- a/indra/llui/lllineeditor.cpp
+++ b/indra/llui/lllineeditor.cpp
@@ -198,6 +198,7 @@ LLLineEditor::~LLLineEditor()
 
 void LLLineEditor::onFocusReceived()
 {
+	gEditMenuHandler = this;
 	LLUICtrl::onFocusReceived();
 	updateAllowingLanguageInput();
 }
-- 
cgit v1.2.3


From c10832bb9ade5efa2a501cb3b39f769aa3024363 Mon Sep 17 00:00:00 2001
From: Richard Nelson <richard@lindenlab.com>
Date: Fri, 16 Sep 2011 11:57:57 -0700
Subject: added Flag as new param type... usage: <foo><bar/></foo> will set the
 bar flag on foo LLSD foo; foo["bar"]; will set the bar flag on foo converted
 notifications unique to use flag

---
 indra/llui/llnotificationtemplate.h | 4 ++--
 indra/llui/lluictrlfactory.h        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'indra/llui')

diff --git a/indra/llui/llnotificationtemplate.h b/indra/llui/llnotificationtemplate.h
index eff572b553..ab777d37a5 100644
--- a/indra/llui/llnotificationtemplate.h
+++ b/indra/llui/llnotificationtemplate.h
@@ -88,10 +88,10 @@ struct LLNotificationTemplate
 	{
 	private:
 		// this idiom allows 
-		// <notification unique="true">
+		// <notification> <unique/> </notification>
 		// as well as
 		// <notification> <unique> <context></context> </unique>...
-		Optional<bool>			dummy_val;
+		Flag			dummy_val;
 	public:
 		Multiple<UniquenessContext>	contexts;
 
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h
index f0ba7fc7d7..d345ad4cd0 100644
--- a/indra/llui/lluictrlfactory.h
+++ b/indra/llui/lluictrlfactory.h
@@ -125,12 +125,12 @@ private:
 
 	// base case for recursion, there are NO base classes of LLInitParam::BaseBlock
 	template<int DUMMY>
-	class ParamDefaults<LLInitParam::BaseBlock, DUMMY> : public LLSingleton<ParamDefaults<LLInitParam::BaseBlock, DUMMY> >
+	class ParamDefaults<LLInitParam::BaseBlockWithFlags, DUMMY> : public LLSingleton<ParamDefaults<LLInitParam::BaseBlockWithFlags, DUMMY> >
 	{
 	public:
-		const LLInitParam::BaseBlock& get() { return mBaseBlock; }
+		const LLInitParam::BaseBlockWithFlags& get() { return mBaseBlock; }
 	private:
-		LLInitParam::BaseBlock mBaseBlock;
+		LLInitParam::BaseBlockWithFlags mBaseBlock;
 	};
 
 public:
-- 
cgit v1.2.3