Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Black Dragon Viewer
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
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor 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
Logue
Black Dragon Viewer
Commits
85250265
Commit
85250265
authored
3 years ago
by
Andrey Kleshchev
Browse files
Options
Downloads
Patches
Plain Diff
SL-16105 Fix Day cycle editor not expecting an asset
parent
150993e2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llfloatereditenvironmentbase.h
+1
-1
1 addition, 1 deletion
indra/newview/llfloatereditenvironmentbase.h
indra/newview/llfloatereditextdaycycle.h
+0
-2
0 additions, 2 deletions
indra/newview/llfloatereditextdaycycle.h
with
1 addition
and
3 deletions
indra/newview/llfloatereditenvironmentbase.h
+
1
−
1
View file @
85250265
...
...
@@ -107,7 +107,7 @@ class LLFloaterEditEnvironmentBase : public LLFloater
void
onAssetLoaded
(
LLUUID
asset_id
,
LLSettingsBase
::
ptr_t
settins
,
S32
status
);
pr
ivate
:
pr
otected
:
LLUUID
mExpectingAssetId
;
// for asset load confirmation
};
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llfloatereditextdaycycle.h
+
0
−
2
View file @
85250265
...
...
@@ -194,8 +194,6 @@ class LLFloaterEditExtDayCycle : public LLFloaterEditEnvironmentBase
std
::
string
mLastFrameSlider
;
bool
mShiftCopyEnabled
;
LLUUID
mExpectingAssetId
;
LLButton
*
mAddFrameButton
;
LLButton
*
mDeleteFrameButton
;
LLButton
*
mImportButton
;
...
...
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