From c4eaaa3d6a08330863119d550d365315ba7526bb Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Thu, 8 Nov 2012 12:35:15 -0800
Subject: CHUI-484: Updating the code to rather than refer to it as Busy Mode,
 it now refers to it as Do Not Disturb mode.

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

(limited to 'indra/newview/llviewermenu.h')

diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 3515aa4302..e8665a6ef6 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -188,7 +188,7 @@ extern LLContextMenu* gAttachBodyPartPieMenus[8];
 extern LLContextMenu* gDetachBodyPartPieMenus[8];
 
 extern LLMenuItemCallGL* gAFKMenu;
-extern LLMenuItemCallGL* gBusyMenu;
+extern LLMenuItemCallGL* gDoNotDisturbMenu;
 extern LLMenuItemCallGL* gMutePieMenu;
 extern LLMenuItemCallGL* gMuteObjectPieMenu;
 extern LLMenuItemCallGL* gBuyPassPieMenu;
-- 
cgit v1.2.3


From 4f58b4088a469d907eb33f1e338569016ba4c1f1 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Fri, 9 Nov 2012 14:41:50 -0800
Subject: CHUI-517: Altering the behavior and copy of the main menu status
 choices.  Busy has been replaced with Do Not Disturb.  And both status
 options have been switched to be indicated with a check rather than
 alternating text.

---
 indra/newview/llviewermenu.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llviewermenu.h')

diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index e8665a6ef6..139f898b76 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -187,8 +187,6 @@ extern LLContextMenu* gDetachPieMenu;
 extern LLContextMenu* gAttachBodyPartPieMenus[8];
 extern LLContextMenu* gDetachBodyPartPieMenus[8];
 
-extern LLMenuItemCallGL* gAFKMenu;
-extern LLMenuItemCallGL* gDoNotDisturbMenu;
 extern LLMenuItemCallGL* gMutePieMenu;
 extern LLMenuItemCallGL* gMuteObjectPieMenu;
 extern LLMenuItemCallGL* gBuyPassPieMenu;
-- 
cgit v1.2.3


From be6f3286f4a969a4de73d8f3af7b8262fe70bfb9 Mon Sep 17 00:00:00 2001
From: AlexanderP ProductEngine <apaschenko@productengine.com>
Date: Thu, 13 Dec 2012 18:43:52 +0200
Subject: Fixed path for correct assembly of the project

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

(limited to 'indra/newview/llviewermenu.h')

diff --git a/indra/newview/llviewermenu.h b/indra/newview/llviewermenu.h
index 139f898b76..c0376ba114 100644
--- a/indra/newview/llviewermenu.h
+++ b/indra/newview/llviewermenu.h
@@ -27,7 +27,7 @@
 #ifndef LL_LLVIEWERMENU_H
 #define LL_LLVIEWERMENU_H
 
-#include "llmenugl.h"
+#include "../llui/llmenugl.h"
 #include "llsafehandle.h"
 
 class LLMessageSystem;
-- 
cgit v1.2.3