diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 12:16:24 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-12-16 12:16:24 -0500 |
| commit | ace0be2a7c0665e382e47aeedfcffed7410e11a9 (patch) | |
| tree | 2d437342310d52806c6b378f1046ad56d9eb6456 /indra/newview/llfloaterregioninfo.cpp | |
| parent | 90bb29245cbd9626f840f1d16c351ac415f7c35e (diff) | |
| parent | 1e5f2f5d8c4264cc704c687aa1b624296b6444e2 (diff) | |
merge with avp-tip
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 8a26078f3d..496fa62d05 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -42,18 +42,18 @@ #include "llglheaders.h" #include "llregionflags.h" #include "llstl.h" +#include "llvfile.h" +#include "llxfermanager.h" #include "indra_constants.h" #include "message.h" #include "llagent.h" -#include "llalertdialog.h" #include "llappviewer.h" #include "llfloateravatarpicker.h" #include "llbutton.h" #include "llcheckboxctrl.h" #include "llcombobox.h" #include "llfilepicker.h" -#include "llfloaterdaycycle.h" #include "llfloatergodtools.h" // for send_sim_wide_deletes() #include "llfloatertopobjects.h" // added to fix SL-32336 #include "llfloatergroups.h" @@ -62,7 +62,6 @@ #include "llfloaterwindlight.h" #include "llinventorymodel.h" #include "lllineeditor.h" -#include "llalertdialog.h" #include "llnamelistctrl.h" #include "llnotifications.h" #include "llnotificationsutil.h" |