aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llwlparammanager.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-07 23:14:43 -0700
committerMcCabe Maxsted2009-06-07 23:14:43 -0700
commite0a70bea805cf07b92efabca15ffe56a777f90ac (patch)
tree2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llwlparammanager.h
parent1.1 version final (diff)
parentMerge branch 'sl-base-1.22' into next (diff)
downloadmeta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/llwlparammanager.h')
-rw-r--r--linden/indra/newview/llwlparammanager.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 7094051..1d9291c 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2007&license=viewergpl$ 5 * $LicenseInfo:firstyear=2007&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2007-2008, Linden Research, Inc. 7 * Copyright (c) 2007-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -135,7 +135,7 @@ public:
135 void savePresets(const std::string & fileName); 135 void savePresets(const std::string & fileName);
136 136
137 /// load an individual preset into the sky 137 /// load an individual preset into the sky
138 void loadPreset(const std::string & name); 138 void loadPreset(const std::string & name,bool propogate=true);
139 139
140 /// save the parameter presets to file 140 /// save the parameter presets to file
141 void savePreset(const std::string & name); 141 void savePreset(const std::string & name);
@@ -195,7 +195,6 @@ public:
195 // singleton pattern implementation 195 // singleton pattern implementation
196 static LLWLParamManager * instance(); 196 static LLWLParamManager * instance();
197 197
198
199public: 198public:
200 199
201 // helper variables 200 // helper variables