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

Merge Firestorm LGPL

master
Ansariel 2016-04-02 04:41:27 +02:00
parent 03369ddba1 cc6293fbd6
commit 136a5cd3fb
4 changed files with 6 additions and 6 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
)

5
indra/newview/fsfloatervoicecontrols.cpp
View File

@ -47,6 +47,7 @@
#include "lltextutil.h"
#include "lltransientfloatermgr.h"
#include "llviewercontrol.h"
#include "llviewerdisplayname.h"
#include "llviewerwindow.h"
#include "llvoicechannel.h"
#include "llviewerparcelmgr.h"
@ -122,9 +123,7 @@ FSFloaterVoiceControls::FSFloaterVoiceControls(const LLSD& key)
// update the agent's name if display name setting change
LLAvatarNameCache::addUseDisplayNamesCallback(boost::bind(&FSFloaterVoiceControls::updateAgentModeratorState, this));
//<FS:ND> MERGE_TODO Needs an implementation post coroutine merge.
// LLViewerDisplayName::addNameChangedCallback(boost::bind(&FSFloaterVoiceControls::updateAgentModeratorState, this));
LLViewerDisplayName::addNameChangedCallback(boost::bind(&FSFloaterVoiceControls::updateAgentModeratorState, this));
}
FSFloaterVoiceControls::~FSFloaterVoiceControls()

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

2
indra/newview/llviewermenu.cpp
View File

@ -9889,7 +9889,7 @@ void handle_rebake_textures(void*)
// [SL:KB] - Patch: Appearance-Misc | Checked: 2015-06-27 (Catznip-3.7)
// LLAppearanceMgr::instance().syncCofVersionAndRefresh();
// [/SL:KB]
// LLAppearanceMgr::instance().requestServerAppearanceUpdate();
LLAppearanceMgr::instance().requestServerAppearanceUpdate(); // Comment out again once syncCofVersionAndRefresh() is back!
avatar_tex_refresh(); // <FS:CR> FIRE-11800 - Refresh the textures too
}
}