diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-04-27 16:02:30 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-04-27 16:02:30 -0700 |
| commit | 8a265498d02ee9322b5ed6dbd1fae6b60dbe843d (patch) | |
| tree | fbed43ec7f1d3b7baa816c8de8b0cc2cadd5ee6d /indra/llxml/llcontrol.cpp | |
| parent | 36986de1fc1437f509d120b79430c87575e755b1 (diff) | |
| parent | f4540fab4887f6fe54ed6472c4b2458e3ac745d5 (diff) | |
Merge.
Diffstat (limited to 'indra/llxml/llcontrol.cpp')
| -rw-r--r-- | indra/llxml/llcontrol.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llxml/llcontrol.cpp b/indra/llxml/llcontrol.cpp index 6e4364a20d..a604c1e631 100644 --- a/indra/llxml/llcontrol.cpp +++ b/indra/llxml/llcontrol.cpp @@ -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")) { |