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
bea2e982
Commit
bea2e982
authored
11 years ago
by
Ima Mechanique
Browse files
Options
Downloads
Patches
Plain Diff
Fixing some references to 'filename' I forgot to rename to mFullFileSpec.
parent
3b03ffbd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/contributions.txt
+2
-1
2 additions, 1 deletion
doc/contributions.txt
indra/newview/llsyntaxid.cpp
+3
-3
3 additions, 3 deletions
indra/newview/llsyntaxid.cpp
with
5 additions
and
4 deletions
doc/contributions.txt
+
2
−
1
View file @
bea2e982
...
@@ -514,7 +514,8 @@ Ima Mechanique
...
@@ -514,7 +514,8 @@ Ima Mechanique
VWR-10791
VWR-10791
VWR-20553
VWR-20553
VWR-19213
VWR-19213
VWR-23739
VWR-22401
VWR-23739
VWR-24766
VWR-24766
VWR-28065
VWR-28065
Imnotgoing Sideways
Imnotgoing Sideways
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llsyntaxid.cpp
+
3
−
3
View file @
bea2e982
...
@@ -293,7 +293,7 @@ bool LLSyntaxIdLSL::loadKeywordsFileIntoLLSD()
...
@@ -293,7 +293,7 @@ bool LLSyntaxIdLSL::loadKeywordsFileIntoLLSD()
loaded
=
(
bool
)
LLSDSerialize
::
fromXML
(
content
,
file
);
loaded
=
(
bool
)
LLSDSerialize
::
fromXML
(
content
,
file
);
if
(
!
loaded
)
if
(
!
loaded
)
{
{
LL_WARNS
(
"LSLSyntax"
)
<<
"Unable to deserialise file: "
<<
filename
<<
LL_ENDL
;
LL_WARNS
(
"LSLSyntax"
)
<<
"Unable to deserialise file: "
<<
mFullFileSpec
<<
LL_ENDL
;
// Is this the right thing to do, or should we leave the old content
// Is this the right thing to do, or should we leave the old content
// even if it isn't entirely accurate anymore?
// even if it isn't entirely accurate anymore?
...
@@ -302,12 +302,12 @@ bool LLSyntaxIdLSL::loadKeywordsFileIntoLLSD()
...
@@ -302,12 +302,12 @@ bool LLSyntaxIdLSL::loadKeywordsFileIntoLLSD()
else
else
{
{
sKeywordsXml
=
content
;
sKeywordsXml
=
content
;
LL_INFOS
(
"LSLSyntax"
)
<<
"Deserialised file: "
<<
filename
<<
LL_ENDL
;
LL_INFOS
(
"LSLSyntax"
)
<<
"Deserialised file: "
<<
mFullFileSpec
<<
LL_ENDL
;
}
}
}
}
else
else
{
{
LL_WARNS
(
"LSLSyntax"
)
<<
"Unable to open file: "
<<
filename
<<
LL_ENDL
;
LL_WARNS
(
"LSLSyntax"
)
<<
"Unable to open file: "
<<
mFullFileSpec
<<
LL_ENDL
;
}
}
return
loaded
;
return
loaded
;
}
}
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