diff options
| author | richard <none@none> | 2009-12-17 10:03:56 -0800 |
|---|---|---|
| committer | richard <none@none> | 2009-12-17 10:03:56 -0800 |
| commit | 724f5fbb7f7b101774c0cf3ff43bb98f9cc4ffc1 (patch) | |
| tree | bfb7b4009b32761f9f760f97dd97cc0697667a71 /indra/newview/llfloatergodtools.cpp | |
| parent | 9ff869a6b287a2b4b8c94219584d1c7b66ebb399 (diff) | |
| parent | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (diff) | |
merge
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" |