diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-01 00:09:32 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-01 00:09:32 +0100 |
| commit | 5c18b349f06457bd6da3fcb12290932fb0d44826 (patch) | |
| tree | f96f29f120c8ca10a1a4e90f19d01a4367b74e92 /indra/newview/llviewermenu.cpp | |
| parent | 184ee74c39f5094283374e8aac714a6cd0fb4285 (diff) | |
| parent | cf0e4f79f52b4fb24769aa6e355ec8c95c6d2afc (diff) | |
Le Merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 456c080f8a..9f25890917 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8476,12 +8476,14 @@ class LLWorldEnvPreset : public view_listener_t if (item == "new_water") { - LLFloaterReg::showInstance("env_edit_water", "new"); + //LLFloaterReg::showInstance("env_edit_water", "new"); + LLFloaterReg::showInstance("env_fixed_environmentent_water", "new"); } else if (item == "edit_water") { - LLFloaterReg::showInstance("env_edit_water", "edit"); - } + //LLFloaterReg::showInstance("env_edit_water", "edit"); + LLFloaterReg::showInstance("env_fixed_environmentent_water", "edit"); + } else if (item == "new_sky") { LLFloaterReg::showInstance("env_edit_sky", "new"); |