From 11a148415e810706f2a1835b6b717a0a062d458f Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Fri, 28 Sep 2012 18:22:05 -0700
Subject: CHUI-102: Now the participants and one-on-one conversations have
 right-click-menus. These menus are functional as well, but 'chat history'
 does not yet work.

---
 indra/llui/llfolderview.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/llui/llfolderview.h')

diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 81b0f087e8..260275269d 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -94,6 +94,8 @@ public:
 								use_ellipses,
 								show_item_link_overlays;
 		Mandatory<LLFolderViewModelInterface*>	view_model;
+        Optional<std::string>   options_menu;
+
 
 		Params();
 	};
-- 
cgit v1.2.3


From 8e1a9e2813da6b9d5c17795b375098fb6a386ee1 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Mon, 1 Oct 2012 13:54:53 -0700
Subject: CHUI-102: Cleaned up code after code review.

---
 indra/llui/llfolderview.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llui/llfolderview.h')

diff --git a/indra/llui/llfolderview.h b/indra/llui/llfolderview.h
index 260275269d..487391a477 100644
--- a/indra/llui/llfolderview.h
+++ b/indra/llui/llfolderview.h
@@ -94,7 +94,7 @@ public:
 								use_ellipses,
 								show_item_link_overlays;
 		Mandatory<LLFolderViewModelInterface*>	view_model;
-        Optional<std::string>   options_menu;
+        Mandatory<std::string>   options_menu;
 
 
 		Params();
-- 
cgit v1.2.3