diff options
author | Graham Linden <graham@lindenlab.com> | 2019-02-21 08:23:26 -0800 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-02-21 08:23:26 -0800 |
commit | 5ff4580cbb950b82cdcec6574b3292ea3d67ac21 (patch) | |
tree | 15fc6ac8a6fa2500cb5dc4578aa4807f96b82e9b /indra/newview/llviewermenu.cpp | |
parent | 5bc31e5992ad3891de469b4c452090f7f348fcbb (diff) | |
parent | e1d8f11a21c76d0632471dce9f5b23246137546a (diff) |
Merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 1bbda04ae6..c9b13f92d3 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8616,7 +8616,6 @@ 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"); |