From f6d9ddd905fd7f5cf0e9fed5d27fd24cbd3f507e Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Sat, 2 Apr 2016 04:21:36 +0200
Subject: [PATCH] Fix merge issues

---
 indra/llui/CMakeLists.txt            | 1 +
 indra/newview/llviewerfoldertype.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 62e43ecd55..3f73947960 100755
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -287,6 +287,7 @@ target_link_libraries(llui
     ${LLXML_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${HUNSPELL_LIBRARY}
+    ${LLMESSAGE_LIBRARIES}
     ${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender
     )
 
diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 19048fa024..2f7aff176c 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -138,7 +138,7 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	//
 	//bool boxes_invisible = !gSavedSettings.getBOOL("InventoryOutboxMakeVisible");
 	//addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Received Items",			"Inv_SysOpen",			"Inv_SysClosed",		FALSE,     boxes_invisible));
-	//addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Merchant Outbox",		"Inv_SysOpen",			"Inv_SysClosed",		FALSE,     boxes_invisible));
+	//addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Merchant Outbox",		"Inv_SysOpen",			"Inv_SysClosed",		FALSE,     true));
 
 	addEntry(LLFolderType::FT_TEXTURE, 				new ViewerFolderEntry("Textures",				"Inv_TexturesOpen",		"Inv_TexturesClosed",	FALSE,     true));
 	addEntry(LLFolderType::FT_SOUND, 				new ViewerFolderEntry("Sounds",					"Inv_SoundOpen",		"Inv_SoundClosed",		FALSE,     true));
@@ -164,7 +164,7 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	
 	bool boxes_invisible = !gSavedSettings.getBOOL("InventoryOutboxMakeVisible");
 	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Received Items",			"Inv_InboxOpen",		"Inv_InboxClosed",		FALSE,     true));
-	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Merchant Outbox",		"Inv_OutboxOpen",		"Inv_SysClosed",		FALSE,     boxes_invisible));
+	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Merchant Outbox",		"Inv_OutboxOpen",		"Inv_OutboxClosed",		FALSE,     true));
 	// </FS:Ansariel> Use individual icons for different folder types
 
 	addEntry(LLFolderType::FT_BASIC_ROOT, 			new ViewerFolderEntry("Basic Root",				"Inv_SysOpen",			"Inv_SysClosed",		FALSE,     true));