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

Merge branch 'release/2024.09-ExtraFPS' of https://github.com/secondlife/viewer 

# Conflicts:
#	indra/newview/skins/default/xui/en/menu_viewer.xml
master
Ansariel 2024-10-16 19:14:13 +02:00
parent 8fd20a1af6 bd19bbf651
commit b1a253e26c
11 changed files with 18 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@ -4868,6 +4868,17 @@
<key>Backup</key>
<integer>0</integer>
</map>
<key>UseGroupMemberPagination</key>
<map>
<key>Comment</key>
<string>Enable pagination of group memeber list 50 members at a time.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>DisplayTimecode</key>
<map>
<key>Comment</key>

2
indra/newview/featuretable.txt
View File

@ -77,7 +77,7 @@ RenderScreenSpaceReflections 1 1
RenderMirrors 1 1
RenderHeroProbeResolution 1 2048
RenderHeroProbeDistance 1 16
RenderHeroProbeUpdateRate 1 4
RenderHeroProbeUpdateRate 1 6
RenderHeroProbeConservativeUpdateMultiplier 1 16
RenderDownScaleMethod 1 1
RenderCASSharpness 1 1

2
indra/newview/featuretable_linux.txt
View File

@ -77,7 +77,7 @@ RenderScreenSpaceReflections 1 1
RenderMirrors 1 1
RenderHeroProbeResolution 1 2048
RenderHeroProbeDistance 1 16
RenderHeroProbeUpdateRate 1 4
RenderHeroProbeUpdateRate 1 6
RenderHeroProbeConservativeUpdateMultiplier 1 16
RenderDownScaleMethod 1 1
RenderCASSharpness 1 1

2
indra/newview/featuretable_mac.txt
View File

@ -77,7 +77,7 @@ RenderReflectionProbeLevel 1 3
RenderMirrors 1 1
RenderHeroProbeResolution 1 2048
RenderHeroProbeDistance 1 16
RenderHeroProbeUpdateRate 1 4
RenderHeroProbeUpdateRate 1 6
RenderHeroProbeConservativeUpdateMultiplier 1 16
RenderCASSharpness 1 1

14
indra/newview/llagent.cpp
View File

@ -391,20 +391,6 @@ bool LLAgent::isMicrophoneOn(const LLSD& sdname)
return LLVoiceClient::getInstance()->getUserPTTState();
}
//static
void LLAgent::toggleHearMediaSoundFromAvatar()
{
const S32 mediaSoundsEarLocation = gSavedSettings.getS32("MediaSoundsEarLocation");
gSavedSettings.setS32("MediaSoundsEarLocation", !mediaSoundsEarLocation);
}
//static
void LLAgent::toggleHearVoiceFromAvatar()
{
const S32 voiceEarLocation = gSavedSettings.getS32("VoiceEarLocation");
gSavedSettings.setS32("VoiceEarLocation", !voiceEarLocation);
}
// ************************************************************
// Enabled this definition to compile a 'hacked' viewer that
// locally believes the end user has godlike powers.

7
indra/newview/llagent.h
View File

@ -396,13 +396,6 @@ public:
private:
bool mVoiceConnected;
//--------------------------------------------------------------------
// Sound
//--------------------------------------------------------------------
public:
static void toggleHearMediaSoundFromAvatar();
static void toggleHearVoiceFromAvatar();
//--------------------------------------------------------------------
// Chat
//--------------------------------------------------------------------

3
indra/newview/llpanelgrouproles.cpp
View File

@ -1397,7 +1397,8 @@ void LLPanelGroupMembersSubTab::activate()
{
if (!gdatap || !gdatap->isMemberDataComplete())
{
const U32 page_size = 50;
static LLCachedControl<bool> enable_pagination(gSavedSettings, "UseGroupMemberPagination", false);
const U32 page_size = enable_pagination() ? 50 : 0;
std::string sort_column_name = mMembersList->getSortColumnName();
bool sort_descending = !mMembersList->getSortAscending();
LLGroupMgr::getInstance()->sendCapGroupMembersRequest(mGroupID, page_size, 0, sort_column_name, sort_descending);

4
indra/newview/lltexturefetch.cpp
View File

@ -2293,7 +2293,7 @@ bool LLTextureFetchWorker::deleteOK()
// Allow any pending reads or writes to complete
if (mCacheReadHandle != LLTextureCache::nullHandle())
{
if (mFetcher->mTextureCache->readComplete(mCacheReadHandle, true))
if (!mFetcher->mTextureCache || mFetcher->mTextureCache->readComplete(mCacheReadHandle, true))
{
mCacheReadHandle = LLTextureCache::nullHandle();
}
@ -2304,7 +2304,7 @@ bool LLTextureFetchWorker::deleteOK()
}
if (mCacheWriteHandle != LLTextureCache::nullHandle())
{
if (mFetcher->mTextureCache->writeComplete(mCacheWriteHandle))
if (!mFetcher->mTextureCache || mFetcher->mTextureCache->writeComplete(mCacheWriteHandle))
{
mCacheWriteHandle = LLTextureCache::nullHandle();
}

2
indra/newview/llviewermenu.cpp
View File

@ -12379,8 +12379,6 @@ void initialize_menus()
commit.add("Agent.ToggleMicrophone", boost::bind(&LLAgent::toggleMicrophone, _2));
enable.add("Agent.IsMicrophoneOn", boost::bind(&LLAgent::isMicrophoneOn, _2));
enable.add("Agent.IsActionAllowed", boost::bind(&LLAgent::isActionAllowed, _2));
commit.add("Agent.ToggleHearMediaSoundFromAvatar", boost::bind(&LLAgent::toggleHearMediaSoundFromAvatar));
commit.add("Agent.ToggleHearVoiceFromAvatar", boost::bind(&LLAgent::toggleHearVoiceFromAvatar));
// File menu
init_menu_file();

2
indra/newview/skins/default/xui/de/menu_viewer.xml
View File

@ -108,8 +108,6 @@
<menu_item_check label="Unterhaltungsprotokoll..." name="Conversation Log..."/>
<menu_item_check label="Stimmen in der Nähe" name="Nearby Voice"/>
<menu_item_call label="Blockierliste" name="Block List"/>
<menu_item_check label="Medien und Klänge von Avatar-Position hören" name="Hear Media and Sound from Avatar"/>
<menu_item_check label="Voice-Chat von Avatar-Position hören" name="Hear Voice from Avatar"/>
</menu>
<menu label="Welt" name="World">
<menu_item_call label="Animationen synchronisieren" name="Resync Animations"/>

21
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -912,27 +912,6 @@
function="SideTray.PanelPeopleTab"
parameter="blocked_panel" />
</menu_item_call>
<menu_item_separator/>
<menu_item_check
label="Hear Media and Sound from Avatar"
name="Hear Media and Sound from Avatar">
<menu_item_check.on_check
control="MediaSoundsEarLocation" />
<menu_item_check.on_click
function="Agent.ToggleHearMediaSoundFromAvatar" />
</menu_item_check>
<menu_item_check
label="Hear Voice from Avatar"
name="Hear Voice from Avatar">
<menu_item_check.on_check
control="VoiceEarLocation" />
<menu_item_check.on_click
function="Agent.ToggleHearVoiceFromAvatar" />
<menu_item_call.on_enable
control="EnableVoiceChat" />
</menu_item_check>
</menu>
<!-- World Menu -->