Merge cleanup

2016-08-13 23:35:56 +02:00 · 2016-08-13 23:35:56 +02:00 · 2eadb31a05
parent 76e0f641ce
commit 2eadb31a05
2 changed files with 0 additions and 4 deletions
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@ -61,8 +61,6 @@
 #include "lleventcoro.h"
 #include "llavatarpropertiesprocessor.h"

-#include "llavatarpropertiesprocessor.h"
-
 // [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1)
 #include "rlvactions.h"
 #include "rlvhandler.h"
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@ -44,8 +44,6 @@

 #include "llsdutil.h" // <FS:ND/> for ll_pretty_print_sd

-#include "boost/make_shared.hpp"
-
 namespace LLEventPolling
 {
 namespace Details