Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
XDG Integration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
JennaHuntsman
XDG Integration
Commits
5ce4d42f
Unverified
Commit
5ce4d42f
authored
1 year ago
by
Maxim Nikolenko
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
SL-19993 Warn of automatic changes to Day Cycle when it's opened
parent
880a1ee6
No related branches found
No related tags found
2 merge requests
!3
Update to main branch
,
!2
Rebase onto current main branch
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llfloatereditextdaycycle.cpp
+24
-0
24 additions, 0 deletions
indra/newview/llfloatereditextdaycycle.cpp
indra/newview/llfloatereditextdaycycle.h
+2
-0
2 additions, 0 deletions
indra/newview/llfloatereditextdaycycle.h
with
26 additions
and
0 deletions
indra/newview/llfloatereditextdaycycle.cpp
+
24
−
0
View file @
5ce4d42f
...
@@ -475,6 +475,8 @@ void LLFloaterEditExtDayCycle::refresh()
...
@@ -475,6 +475,8 @@ void LLFloaterEditExtDayCycle::refresh()
void
LLFloaterEditExtDayCycle
::
setEditSettingsAndUpdate
(
const
LLSettingsBase
::
ptr_t
&
settings
)
void
LLFloaterEditExtDayCycle
::
setEditSettingsAndUpdate
(
const
LLSettingsBase
::
ptr_t
&
settings
)
{
{
setEditDayCycle
(
std
::
dynamic_pointer_cast
<
LLSettingsDay
>
(
settings
));
setEditDayCycle
(
std
::
dynamic_pointer_cast
<
LLSettingsDay
>
(
settings
));
showHDRNotification
(
std
::
dynamic_pointer_cast
<
LLSettingsDay
>
(
settings
));
}
}
void
LLFloaterEditExtDayCycle
::
setEditDayCycle
(
const
LLSettingsDay
::
ptr_t
&
pday
)
void
LLFloaterEditExtDayCycle
::
setEditDayCycle
(
const
LLSettingsDay
::
ptr_t
&
pday
)
...
@@ -1710,6 +1712,28 @@ void LLFloaterEditExtDayCycle::onPickerCommitSetting(LLUUID item_id, S32 track)
...
@@ -1710,6 +1712,28 @@ void LLFloaterEditExtDayCycle::onPickerCommitSetting(LLUUID item_id, S32 track)
}
}
}
}
void
LLFloaterEditExtDayCycle
::
showHDRNotification
(
const
LLSettingsDay
::
ptr_t
&
pday
)
{
for
(
U32
i
=
LLSettingsDay
::
TRACK_GROUND_LEVEL
;
i
<=
LLSettingsDay
::
TRACK_MAX
;
i
++
)
{
LLSettingsDay
::
CycleTrack_t
&
day_track
=
pday
->
getCycleTrack
(
i
);
LLSettingsDay
::
CycleTrack_t
::
iterator
iter
=
day_track
.
begin
();
LLSettingsDay
::
CycleTrack_t
::
iterator
end
=
day_track
.
end
();
while
(
iter
!=
end
)
{
LLSettingsSky
::
ptr_t
sky
=
std
::
static_pointer_cast
<
LLSettingsSky
>
(
iter
->
second
);
if
(
sky
&&
sky
->
canAutoAdjust
())
{
LLNotificationsUtil
::
add
(
"AutoAdjustHDRSky"
);
return
;
}
iter
++
;
}
}
}
void
LLFloaterEditExtDayCycle
::
onAssetLoadedForInsertion
(
LLUUID
item_id
,
LLUUID
asset_id
,
LLSettingsBase
::
ptr_t
settings
,
S32
status
,
S32
source_track
,
S32
dest_track
,
LLSettingsBase
::
TrackPosition
frame
)
void
LLFloaterEditExtDayCycle
::
onAssetLoadedForInsertion
(
LLUUID
item_id
,
LLUUID
asset_id
,
LLSettingsBase
::
ptr_t
settings
,
S32
status
,
S32
source_track
,
S32
dest_track
,
LLSettingsBase
::
TrackPosition
frame
)
{
{
std
::
function
<
void
()
>
cb
=
[
this
,
settings
,
frame
,
source_track
,
dest_track
]()
std
::
function
<
void
()
>
cb
=
[
this
,
settings
,
frame
,
source_track
,
dest_track
]()
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfloatereditextdaycycle.h
+
2
−
0
View file @
5ce4d42f
...
@@ -188,6 +188,8 @@ class LLFloaterEditExtDayCycle : public LLFloaterEditEnvironmentBase
...
@@ -188,6 +188,8 @@ class LLFloaterEditExtDayCycle : public LLFloaterEditEnvironmentBase
bool
isRemovingFrameAllowed
();
bool
isRemovingFrameAllowed
();
bool
isAddingFrameAllowed
();
bool
isAddingFrameAllowed
();
void
showHDRNotification
(
const
LLSettingsDay
::
ptr_t
&
pday
);
LLSettingsDay
::
ptr_t
mEditDay
;
// edited copy
LLSettingsDay
::
ptr_t
mEditDay
;
// edited copy
LLSettingsDay
::
Seconds
mDayLength
;
LLSettingsDay
::
Seconds
mDayLength
;
U32
mCurrentTrack
;
U32
mCurrentTrack
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment