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
2840bff7
Commit
2840bff7
authored
13 years ago
by
brad kittenbrink
Browse files
Options
Downloads
Patches
Plain Diff
FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of large LLSD objects.
parent
d4b9db01
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/llxml/llcontrol.cpp
+1
-2
1 addition, 2 deletions
indra/llxml/llcontrol.cpp
with
1 addition
and
2 deletions
indra/llxml/llcontrol.cpp
+
1
−
2
View file @
2840bff7
...
...
@@ -839,7 +839,6 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
{
std
::
string
name
;
LLSD
settings
;
LLSD
control_map
;
llifstream
infile
;
infile
.
open
(
filename
);
if
(
!
infile
.
is_open
())
...
...
@@ -864,7 +863,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
{
bool
persist
=
true
;
name
=
(
*
itr
).
first
;
control_map
=
(
*
itr
).
second
;
LLSD
const
&
control_map
=
(
*
itr
).
second
;
if
(
control_map
.
has
(
"Persist"
))
{
...
...
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