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
44abb8c3
Commit
44abb8c3
authored
12 years ago
by
William Todd Stinson
Browse files
Options
Downloads
Plain Diff
Pull and merge from
https://bitbucket.org/lindenlab/viewer-development
.
parents
a5b6142f
a15ec8d0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.hgtags
+1
-0
1 addition, 0 deletions
.hgtags
indra/llwindow/llwindowsdl.cpp
+2
-1
2 additions, 1 deletion
indra/llwindow/llwindowsdl.cpp
with
3 additions
and
1 deletion
.hgtags
+
1
−
0
View file @
44abb8c3
...
@@ -368,3 +368,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246
...
@@ -368,3 +368,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246
39c5204b6e800983a41ccac8ad6dc993120197c6 DRTVWR-247
39c5204b6e800983a41ccac8ad6dc993120197c6 DRTVWR-247
7c7d57d393e8ae7b61623279de06eb4a62ccae6a DRTVWR-249
7c7d57d393e8ae7b61623279de06eb4a62ccae6a DRTVWR-249
f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230
f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230
b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255
This diff is collapsed.
Click to expand it.
indra/llwindow/llwindowsdl.cpp
+
2
−
1
View file @
44abb8c3
...
@@ -2646,8 +2646,9 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
...
@@ -2646,8 +2646,9 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
if
(
sortpat
)
if
(
sortpat
)
{
{
// Sort the list of system fonts from most-to-least-desirable.
// Sort the list of system fonts from most-to-least-desirable.
FcResult
result
;
fs
=
FcFontSort
(
NULL
,
sortpat
,
elide_unicode_coverage
,
fs
=
FcFontSort
(
NULL
,
sortpat
,
elide_unicode_coverage
,
NULL
,
NULL
);
NULL
,
&
result
);
FcPatternDestroy
(
sortpat
);
FcPatternDestroy
(
sortpat
);
}
}
...
...
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