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
c1065a9a
Commit
c1065a9a
authored
1 year ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Tweak message
parent
2eb4be5d
No related branches found
Branches containing commit
No related tags found
2 merge requests
!3
Update to main branch
,
!2
Rebase onto current main branch
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
indra/llcommon/llerror.cpp
+3
-3
3 additions, 3 deletions
indra/llcommon/llerror.cpp
indra/llui/lltransutil.cpp
+3
-3
3 additions, 3 deletions
indra/llui/lltransutil.cpp
indra/newview/skins/default/xui/en/strings.xml
+1
-1
1 addition, 1 deletion
indra/newview/skins/default/xui/en/strings.xml
with
7 additions
and
7 deletions
indra/llcommon/llerror.cpp
+
3
−
3
View file @
c1065a9a
...
@@ -1639,9 +1639,9 @@ namespace LLError
...
@@ -1639,9 +1639,9 @@ namespace LLError
{
{
// Files Are missing, likely can't localize.
// Files Are missing, likely can't localize.
const
std
::
string
error_string
=
const
std
::
string
error_string
=
"
Second Life v
iewer couldn't access some of the files it needs and will be closed."
"
Alchemy V
iewer couldn't access some of the files it needs and will be closed."
"
\n\n
Please reinstall viewer from https://
secondlife.com/supp
or
t
/downloads
/
and "
"
\n\n
Please reinstall viewer from https://
alchemyviewer.
or
g
/downloads and "
"contact
https://support.secondlife.com if
issue persists after reinstall."
;
"contact
the Alchemy Viewer Team if the
issue persists after reinstall."
;
sHandler
(
"Missing Files"
,
error_string
);
sHandler
(
"Missing Files"
,
error_string
);
}
}
...
...
This diff is collapsed.
Click to expand it.
indra/llui/lltransutil.cpp
+
3
−
3
View file @
c1065a9a
...
@@ -45,9 +45,9 @@ bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<s
...
@@ -45,9 +45,9 @@ bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<s
if
(
!
success
)
if
(
!
success
)
{
{
const
std
::
string
error_string
=
const
std
::
string
error_string
=
"
Second Life v
iewer couldn't access some of the files it needs and will be closed."
"
Alchemy V
iewer couldn't access some of the files it needs and will be closed."
"
\n\n
Please reinstall viewer from https://
secondlife.com/supp
or
t
/downloads
/
and "
"
\n\n
Please reinstall viewer from https://
alchemyviewer.
or
g
/downloads and "
"contact
https://support.secondlife.co
m if issue persists after reinstall."
;
"contact
the Alchemy Viewer tea
m if issue persists after reinstall."
;
LLError
::
LLUserWarningMsg
::
show
(
error_string
);
LLError
::
LLUserWarningMsg
::
show
(
error_string
);
gDirUtilp
->
dumpCurrentDirectories
(
LLError
::
LEVEL_WARN
);
gDirUtilp
->
dumpCurrentDirectories
(
LLError
::
LEVEL_WARN
);
LL_ERRS
()
<<
"Couldn't load string table "
<<
xml_filename
<<
" "
<<
errno
<<
LL_ENDL
;
LL_ERRS
()
<<
"Couldn't load string table "
<<
xml_filename
<<
" "
<<
errno
<<
LL_ENDL
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/strings.xml
+
1
−
1
View file @
c1065a9a
...
@@ -3072,7 +3072,7 @@ If your computer's RAM is low, quit any heavy applications before runing Second
...
@@ -3072,7 +3072,7 @@ If your computer's RAM is low, quit any heavy applications before runing Second
<string
name=
"MBMissingFile"
>
<string
name=
"MBMissingFile"
>
[APP_NAME] couldn't access or find some of the files it needs and will be closed.
[APP_NAME] couldn't access or find some of the files it needs and will be closed.
Please reinstall viewer from
https://
secondlife.com/supp
or
t
/downloads
/
and contact
https://support.secondlife.co
m if issue persists after reinstall.
Please reinstall viewer from https://
alchemyviewer.
or
g
/downloads and contact
the Alchemy Viewer tea
m if issue persists after reinstall.
</string>
</string>
<!-- Avatar Shape Information -->
<!-- Avatar Shape Information -->
...
...
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