livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge issues

master
Ansariel 2016-04-02 04:21:36 +02:00
parent e252cfaa12
commit f6d9ddd905
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llui/CMakeLists.txt
View File

@ -287,6 +287,7 @@ target_link_libraries(llui
${LLXML_LIBRARIES}
${LLMATH_LIBRARIES}
${HUNSPELL_LIBRARY}
${LLMESSAGE_LIBRARIES}
${LLCOMMON_LIBRARIES} # must be after llimage, llwindow, llrender
)

4
indra/newview/llviewerfoldertype.cpp
View File

@ -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));