diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-15 22:37:44 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-15 22:37:44 +0100 |
| commit | ddd0094e22b53c91d2a2e25ea62a535763237238 (patch) | |
| tree | c7ed920f490c701c9e1a8baacf91046515deeb51 /indra/newview/llviewermenu.cpp | |
| parent | 23d2a97cda93d73ae1f5cae300b0e7534868f455 (diff) | |
| parent | 885853b41775296d536f9bcb3614264109430c2b (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 6bc28ad284..861ef05dbd 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8474,6 +8474,7 @@ class LLWorldEnvPreset : public view_listener_t { std::string item = userdata.asString(); +// *LAPRAS* These go away! Keep for the moment. if (item == "new_water") { LLFloaterReg::showInstance("env_fixed_environmentent_water", "new"); |