diff options
author | richard <none@none> | 2009-12-17 09:57:43 -0800 |
---|---|---|
committer | richard <none@none> | 2009-12-17 09:57:43 -0800 |
commit | cf63ce4dc1176d9df4fe852821e4a6d32332f7c6 (patch) | |
tree | 8e77e822118f4979759caab99df48975f79994c7 /indra/newview/llfloatergodtools.cpp | |
parent | f452c01915be011814d92dcc1a398f450b6ce9c2 (diff) | |
parent | 4dd37a10633c95a9806b608b4db4d0a2d3141a21 (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" |