diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/llrender/llpostprocess.h (renamed from linden/indra/newview/llpostprocess.h) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llpostprocess.h b/linden/indra/llrender/llpostprocess.h index 738d0f0..cd9f477 100644 --- a/linden/indra/newview/llpostprocess.h +++ b/linden/indra/llrender/llpostprocess.h | |||
@@ -207,7 +207,7 @@ public: | |||
207 | 207 | ||
208 | void setSelectedEffect(std::string const & effectName); | 208 | void setSelectedEffect(std::string const & effectName); |
209 | 209 | ||
210 | inline LLString const & getSelectedEffect(void) const { | 210 | inline std::string const & getSelectedEffect(void) const { |
211 | return mSelectedEffectName; | 211 | return mSelectedEffectName; |
212 | } | 212 | } |
213 | 213 | ||
@@ -229,7 +229,7 @@ private: | |||
229 | 229 | ||
230 | // the name of currently selected effect in mAllEffects | 230 | // the name of currently selected effect in mAllEffects |
231 | // invariant: tweaks == mAllEffects[mSelectedEffectName] | 231 | // invariant: tweaks == mAllEffects[mSelectedEffectName] |
232 | LLString mSelectedEffectName; | 232 | std::string mSelectedEffectName; |
233 | 233 | ||
234 | /// General functions | 234 | /// General functions |
235 | void initialize(unsigned int width, unsigned int height); | 235 | void initialize(unsigned int width, unsigned int height); |