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-01 13:11:13 +02:00
parent 3772acc7b9 690f099519
commit cad8edc0f3
5 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llinventory/llsettingsdaycycle.cpp
View File

@ -144,10 +144,6 @@ LLSettingsDay::LLSettingsDay() :
//=========================================================================
LLSD& LLSettingsDay::getSettings()
{
if (mDaySettings.size() > 0)
{
return mDaySettings;
}
mDaySettings = LLSD::emptyMap();
LLSD& settings = LLSettingsBase::getSettings();

1
indra/newview/llenvironment.cpp
View File

@ -2228,7 +2228,6 @@ void LLEnvironment::coroUpdateEnvironment(S32 parcel_id, S32 track_no, UpdateInf
body[KEY_ENVIRONMENT][KEY_DAYLENGTH] = updates->mDayLength;
}
// server only allows positive values
if (updates->mDayOffset > 0)
{
body[KEY_ENVIRONMENT][KEY_DAYOFFSET] = updates->mDayOffset;

16
indra/newview/llpanelenvironment.cpp
View File

@ -287,8 +287,8 @@ void LLPanelEnvironmentInfo::refresh()
F32Hours daylength(mCurrentEnvironment->mDayLength);
F32Hours dayoffset(mCurrentEnvironment->mDayOffset);
while (dayoffset.value() >= daylength.value())
dayoffset -= daylength;
if (dayoffset.value() > 12.0f)
dayoffset -= F32Hours(24.0);
mSliderDayLength->setValue(daylength.value());
mSliderDayOffset->setValue(dayoffset.value());
@ -717,11 +717,6 @@ void LLPanelEnvironmentInfo::onSldDayLengthChanged(F32 value)
F32Hours daylength(value);
mCurrentEnvironment->mDayLength = daylength;
F32 offset = (F32)mSliderDayOffset->getValue().asReal();
if (offset <= 0.0f)
{
onSldDayOffsetChanged(offset);
}
setDirtyFlag(DIRTY_FLAG_DAYLENGTH);
udpateApparentTimeOfDay();
@ -734,9 +729,8 @@ void LLPanelEnvironmentInfo::onSldDayOffsetChanged(F32 value)
{
F32Hours dayoffset(value);
// server only allows positive values
while (dayoffset.value() <= 0.0f)
dayoffset += mCurrentEnvironment->mDayLength;
if (dayoffset.value() <= 0.0f)
dayoffset += F32Hours(24.0);
mCurrentEnvironment->mDayOffset = dayoffset;
setDirtyFlag(DIRTY_FLAG_DAYOFFSET);
@ -928,7 +922,7 @@ void LLPanelEnvironmentInfo::udpateApparentTimeOfDay()
{
static const F32 SECONDSINDAY(24.0 * 60.0 * 60.0);
if ((!mCurrentEnvironment) || (mCurrentEnvironment->mDayLength.value() < 1.0))
if ((!mCurrentEnvironment) || (mCurrentEnvironment->mDayLength.value() < 1.0) || (mCurrentEnvironment->mDayOffset.value() < 1.0))
{
mLabelApparentTime->setVisible(false);
return;

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

@ -52,8 +52,6 @@
</menu>
<menu_item_check label="Steuerung" name="Movement Controls"/>
<menu_item_check label="Kamerasteuerung" name="Camera Controls"/>
<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 label="Avatar-Befinden" name="avhealth">
<menu_item_call label="Avatar-Animationen stoppen" name="Stop Animating My Avatar"/>
<menu_item_call label="Avatar-Animationen stoppen &amp; Skripten Rechte entziehen" name="Stop Animating My Avatar With Revoke"/>
@ -110,6 +108,8 @@
<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"/>

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

@ -467,27 +467,6 @@
<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_item_separator/>
<menu
create_jump_keys="true"
label="Avatar Health"
@ -933,6 +912,27 @@
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 -->