Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
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
Alchemy Viewer
Alchemy Viewer
Commits
1c17e512
Commit
1c17e512
authored
5 years ago
by
Dave Houlton
Browse files
Options
Downloads
Patches
Plain Diff
DRTVWR-440, whitespace change to test TeamCity trigger
parent
b1b5075d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llfeaturemanager.cpp
+21
-21
21 additions, 21 deletions
indra/newview/llfeaturemanager.cpp
with
21 additions
and
21 deletions
indra/newview/llfeaturemanager.cpp
+
21
−
21
View file @
1c17e512
...
...
@@ -617,36 +617,36 @@ void LLFeatureManager::applyFeatures(bool skipFeatures)
void
LLFeatureManager
::
setGraphicsLevel
(
U32
level
,
bool
skipFeatures
)
{
LLViewerShaderMgr
::
sSkipReload
=
true
;
LLViewerShaderMgr
::
sSkipReload
=
true
;
applyBaseMasks
();
applyBaseMasks
();
// if we're passed an invalid level, default to "Low"
std
::
string
features
(
isValidGraphicsLevel
(
level
)
?
getNameForGraphicsLevel
(
level
)
:
"Low"
);
if
(
features
==
"Low"
)
{
// if we're passed an invalid level, default to "Low"
std
::
string
features
(
isValidGraphicsLevel
(
level
)
?
getNameForGraphicsLevel
(
level
)
:
"Low"
);
if
(
features
==
"Low"
)
{
#if LL_DARWIN
// This Mac-specific change is to insure that we force 'Basic Shaders' for all Mac
// systems which support them instead of falling back to fixed-function unnecessarily
// MAINT-2157
if
(
gGLManager
.
mGLVersion
<
2.1
f
)
// This Mac-specific change is to insure that we force 'Basic Shaders' for all Mac
// systems which support them instead of falling back to fixed-function unnecessarily
// MAINT-2157
if
(
gGLManager
.
mGLVersion
<
2.1
f
)
#else
// only use fixed function by default if GL version < 3.0 or this is an intel graphics chip
if
(
gGLManager
.
mGLVersion
<
3.
f
||
gGLManager
.
mIsIntel
)
// only use fixed function by default if GL version < 3.0 or this is an intel graphics chip
if
(
gGLManager
.
mGLVersion
<
3.
f
||
gGLManager
.
mIsIntel
)
#endif
{
{
// same as Low, but with "Basic Shaders" disabled
features
=
"LowFixedFunction"
;
}
}
features
=
"LowFixedFunction"
;
}
}
maskFeatures
(
features
);
maskFeatures
(
features
);
applyFeatures
(
skipFeatures
);
applyFeatures
(
skipFeatures
);
LLViewerShaderMgr
::
sSkipReload
=
false
;
LLViewerShaderMgr
::
instance
()
->
setShaders
();
gPipeline
.
refreshCachedSettings
();
LLViewerShaderMgr
::
sSkipReload
=
false
;
LLViewerShaderMgr
::
instance
()
->
setShaders
();
gPipeline
.
refreshCachedSettings
();
}
void
LLFeatureManager
::
applyBaseMasks
()
...
...
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