diff options
author | Rider Linden <rider@lindenlab.com> | 2018-03-07 11:27:43 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2018-03-07 11:27:43 -0800 |
commit | 7b56db31f91545102744885b4f70c93278e837bd (patch) | |
tree | 97bd880e3aeb1f60d667344e6693b46c8ba120eb /indra/newview/pipeline.cpp | |
parent | 4235231b5adbb7f064cab732f761dd359ef4b648 (diff) | |
parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) |
Merge
Diffstat (limited to 'indra/newview/pipeline.cpp')
-rw-r--r-- | indra/newview/pipeline.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 8f691a0453..634a23b461 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -12050,4 +12050,4 @@ void LLPipeline::restoreHiddenObject( const LLUUID& id ) bool LLPipeline::useAdvancedAtmospherics() const { return sUseAdvancedAtmospherics; -}
\ No newline at end of file +} |