diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llwaterparammanager.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llwaterparammanager.cpp')
| -rw-r--r-- | linden/indra/newview/llwaterparammanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp index 6e2b420..2386631 100644 --- a/linden/indra/newview/llwaterparammanager.cpp +++ b/linden/indra/newview/llwaterparammanager.cpp | |||
| @@ -69,7 +69,7 @@ | |||
| 69 | 69 | ||
| 70 | #include "llwlparammanager.h" | 70 | #include "llwlparammanager.h" |
| 71 | #include "llwaterparamset.h" | 71 | #include "llwaterparamset.h" |
| 72 | #include "lightshare.h" | 72 | #include "llettherebelight.h" |
| 73 | #include "llpostprocess.h" | 73 | #include "llpostprocess.h" |
| 74 | #include "llfloaterwater.h" | 74 | #include "llfloaterwater.h" |
| 75 | 75 | ||