diff options
| author | Callum Prentice <callum@gmail.com> | 2020-11-11 13:22:35 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-11-11 13:22:35 -0800 |
| commit | 9b1d9150c23ac378623e6222c742753d6dc39070 (patch) | |
| tree | 7b28475acf539006c3d674decd36cfeb72aba992 /indra/newview/llfloaterimcontainer.cpp | |
| parent | 727b89e94cc5125c62b0eaebe304ba613f38225a (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' into DRTVWR-519
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 82ce97f311..2a05f82f94 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -54,6 +54,7 @@ #include "llcallbacklist.h" #include "llworld.h" #include "llsdserialize.h" +#include "llviewermenu.h" // is_agent_mappable #include "llviewerobjectlist.h" #include "boost/foreach.hpp" |