diff options
author | Igor Borovkov <iborovkov@productengine.com> | 2009-12-11 15:15:41 +0200 |
---|---|---|
committer | Igor Borovkov <iborovkov@productengine.com> | 2009-12-11 15:15:41 +0200 |
commit | 178ce6df01b0e73476fbde03d7c72622c443f5b7 (patch) | |
tree | ecfa2e9fdff7d0e04432df0a71226a643eea83ce /indra/newview/llfloatergodtools.cpp | |
parent | 12fb5d3a2de9fe49c75b302353f09fc724245a1b (diff) | |
parent | 5aecd0b93f6d79ef447aca241b082f0fb468d78b (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloatergodtools.cpp')
-rw-r--r-- | indra/newview/llfloatergodtools.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index 04ba11530a..e1409b8ad5 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -45,7 +45,6 @@ #include "message.h" #include "llagent.h" -#include "llalertdialog.h" #include "llbutton.h" #include "llcheckboxctrl.h" #include "llcombobox.h" @@ -69,7 +68,6 @@ #include "llviewerwindow.h" #include "llworld.h" #include "llfloateravatarpicker.h" -#include "llnotify.h" #include "llxfermanager.h" #include "llvlcomposition.h" #include "llsurface.h" |