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

Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus 

# Conflicts:
#	indra/newview/featuretable.txt
#	indra/newview/llpanelpeople.cpp
meow-7.2.2
Ansariel 2024-08-21 01:54:01 +02:00
parent d070c175e0 59bf1d192b
commit 16db785e2f
7 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/featuretable_linux.txt
View File

@ -68,6 +68,7 @@ RenderShadowDetail 1 2
RenderUseStreamVBO 1 1
RenderFSAASamples 1 16
RenderMaxTextureIndex 1 16
RenderMirrors 1 1
RenderGLContextCoreProfile 1 1
RenderGLMultiThreadedTextures 1 0
RenderGLMultiThreadedMedia 1 1

2
indra/newview/featuretable_mac.txt
View File

@ -247,7 +247,7 @@ RenderReflectionsEnabled 1 1
RenderReflectionProbeDetail 1 1
RenderScreenSpaceReflections 1 0
RenderReflectionProbeLevel 1 1
RenderMirrors 1 1
RenderMirrors 1 0
RenderHeroProbeResolution 1 512
RenderHeroProbeDistance 1 8
RenderHeroProbeUpdateRate 1 2

4
indra/newview/fsfloatercontacts.cpp
View File

@ -84,13 +84,13 @@ FSFloaterContacts::FSFloaterContacts(const LLSD& seed)
{
LLAvatarTracker::instance().addObserver(this);
// For notification when SIP online status changes.
LLVoiceClient::getInstance()->addObserver(this);
LLVoiceClient::addObserver(this);
}
FSFloaterContacts::~FSFloaterContacts()
{
// For notification when SIP online status changes.
LLVoiceClient::getInstance()->removeObserver(this);
LLVoiceClient::removeObserver(this);
LLAvatarTracker::instance().removeObserver(this);
if (mRlvBehaviorCallbackConnection.connected())

12
indra/newview/fsfloaterim.cpp
View File

@ -235,10 +235,7 @@ void FSFloaterIM::onClose(bool app_quitting)
// AO: Make sure observers are removed on close
mVoiceChannelStateChangeConnection.disconnect();
if(LLVoiceClient::instanceExists())
{
LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this);
}
LLVoiceClient::removeObserver((LLVoiceClientStatusObserver*)this);
//<FS:ND> FIRE-6077 et al: Always clean up observers when the floater dies
LLAvatarTracker::instance().removeParticularFriendObserver(mOtherParticipantUUID, this);
@ -616,10 +613,7 @@ FSFloaterIM::~FSFloaterIM()
LLTransientFloaterMgr::getInstance()->removeControlView(LLTransientFloaterMgr::IM, (LLView*)this);
mVoiceChannelStateChangeConnection.disconnect();
if (LLVoiceClient::instanceExists())
{
LLVoiceClient::getInstance()->removeObserver((LLVoiceClientStatusObserver*)this);
}
LLVoiceClient::removeObserver((LLVoiceClientStatusObserver*)this);
LLIMModel::LLIMSession* pIMSession = LLIMModel::instance().findIMSession(mSessionID);
if ((pIMSession) && (pIMSession->mSessionType == LLIMModel::LLIMSession::P2P_SESSION))
@ -961,7 +955,7 @@ bool FSFloaterIM::postBuild()
updateButtons(mVoiceChannel->getState() >= LLVoiceChannel::STATE_CALL_STARTED);
LL_DEBUGS("FSFloaterIM") << "voice_channel end" << LL_ENDL;
}
LLVoiceClient::getInstance()->addObserver((LLVoiceClientStatusObserver*)this);
LLVoiceClient::addObserver((LLVoiceClientStatusObserver*)this);
// </AO>

16
indra/newview/fsfloatervoicecontrols.cpp
View File

@ -79,7 +79,7 @@ FSFloaterVoiceControls::FSFloaterVoiceControls(const LLSD& key)
static LLUICachedControl<S32> voice_left_remove_delay ("VoiceParticipantLeftRemoveDelay", 10);
mSpeakerDelayRemover = new LLSpeakersDelayActionsStorage(boost::bind(&FSFloaterVoiceControls::removeVoiceLeftParticipant, this, _1), (F32)voice_left_remove_delay);
LLVoiceClient::instance().addObserver(this);
LLVoiceClient::addObserver(this);
LLTransientFloaterMgr::getInstance()->addControlView(this);
// update the agent's name if display name setting change
@ -99,10 +99,7 @@ FSFloaterVoiceControls::~FSFloaterVoiceControls()
mAvatarListRefreshConnection.disconnect();
mVoiceChannelStateChangeConnection.disconnect();
if(LLVoiceClient::instanceExists())
{
LLVoiceClient::getInstance()->removeObserver(this);
}
LLVoiceClient::removeObserver(this);
LLTransientFloaterMgr::getInstance()->removeControlView(this);
}
@ -513,13 +510,12 @@ void FSFloaterVoiceControls::updateAgentModeratorState()
static void get_voice_participants_uuids(uuid_vec_t& speakers_uuids)
{
// Get a list of participants from VoiceClient
std::set<LLUUID> participants;
LLVoiceClient::getInstance()->getParticipantList(participants);
std::set<LLUUID> participants;
LLVoiceClient::getInstance()->getParticipantList(participants);
for (std::set<LLUUID>::const_iterator iter = participants.begin();
iter != participants.end(); ++iter)
for (const auto& speaker_uuid : participants)
{
speakers_uuids.push_back(*iter);
speakers_uuids.emplace_back(speaker_uuid);
}
}

1
indra/newview/llpanelpeople.cpp
View File

@ -627,7 +627,6 @@ LLPanelPeople::~LLPanelPeople()
mGroupsFilterCommitConnection.disconnect();
mRecentFilterCommitConnection.disconnect();
// [FS:CR] Contact sets
if (mContactSetChangedConnection.connected())
mContactSetChangedConnection.disconnect();

6
indra/newview/pipeline.cpp
View File

@ -103,13 +103,7 @@
#include "llmutelist.h"
#include "lltoolpie.h"
#include "llnotifications.h"
// <FS:Beq> hacky BOOL workaround
#ifndef BOOL
#define BOOL bool
#endif
// </FS:Beq>
#include "llpathinglib.h"
#undef BOOL // <FS:Beq/> hacky BOOL workaround
#include "llfloaterpathfindingconsole.h"
#include "llfloaterpathfindingcharacters.h"
#include "llfloatertools.h"