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

Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm

meow-7.2.2
PanteraPolnocy 2023-01-18 15:18:10 +01:00
parent dceda0b4c5 4526e14388
commit 7421167ff2
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llnamelistctrl.cpp
View File

@ -300,9 +300,9 @@ BOOL LLNameListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
LLNameListItem* hit_item = dynamic_cast<LLNameListItem*>(hitItem(x, y));
LLFloater* floater = gFloaterView->getParentFloater(this);
if (floater && floater->isFrontmost() && hit_item)
if (floater && floater->isFrontmost() && hit_item && hit_item->isGroup()) // <FS:Ansariel> Fix wrong check
{
if(hit_item->isGroup())
//if(hit_item->isGroup()) // <FS:Ansariel> Fix wrong check
{
ContextMenuType prev_menu = getContextMenuType();
setContextMenu(MENU_GROUP);
@ -311,7 +311,9 @@ BOOL LLNameListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
return handled;
}
}
return LLScrollListCtrl::handleRightMouseDown(x, y, mask);
// <FS:Ansariel> Inherit from FSScrollListCtrl for additional features
//return LLScrollListCtrl::handleRightMouseDown(x, y, mask);
return FSScrollListCtrl::handleRightMouseDown(x, y, mask);
}
// public

2
indra/newview/llviewercontrol.cpp
View File

@ -1239,7 +1239,7 @@ void settings_setup_listeners()
setting_setup_signal_listener(gSavedSettings, "RenderDeferredSSAO", handleSetShaderChanged);
setting_setup_signal_listener(gSavedSettings, "RenderPerformanceTest", handleRenderPerfTestChanged);
setting_setup_signal_listener(gSavedSettings, "TextureMemory", handleVideoMemoryChanged);
setting_setup_signal_listener(gSavedSettings, "ChatFontSize", handleChatFontSizeChanged);
setting_setup_signal_listener(gSavedSettings, "ChatConsoleFontSize", handleChatFontSizeChanged);
setting_setup_signal_listener(gSavedSettings, "ChatPersistTime", handleChatPersistTimeChanged);
setting_setup_signal_listener(gSavedSettings, "ConsoleMaxLines", handleConsoleMaxLinesChanged);
setting_setup_signal_listener(gSavedSettings, "UploadBakedTexOld", handleUploadBakedTexOldChanged);

3
indra/newview/llviewermessage.cpp
View File

@ -5194,7 +5194,8 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
if (!avatarp)
{
// no agent by this ID...error?
LL_WARNS("Messaging") << "Received animation state for unknown avatar " << uuid << LL_ENDL;
if (!gSavedSettings.getBOOL("FSRenderFriendsOnly")) // <FS:Ansariel> FIRE-32520: Prevent log spam when show friends only is enabled
LL_WARNS("Messaging") << "Received animation state for unknown avatar " << uuid << LL_ENDL;
return;
}