diff options
author | callum <none@none> | 2009-12-15 17:53:03 -0800 |
---|---|---|
committer | callum <none@none> | 2009-12-15 17:53:03 -0800 |
commit | b7747a815f1fb7ee49804b6b2daf2e347b27f7a5 (patch) | |
tree | 7edef8c608cc99cb0e657694d259598294858851 /indra/newview/llfloaterbuycontents.cpp | |
parent | f923f896bca0d0d8459c35a5ef8e0d0171cbe664 (diff) | |
parent | fc40740e1e5a7fcb1ed8bf3b4b6eaffe7d3d9c07 (diff) |
Merge with tip before push
Diffstat (limited to 'indra/newview/llfloaterbuycontents.cpp')
-rw-r--r-- | indra/newview/llfloaterbuycontents.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp index 39c7bc02af..0daef27af2 100644 --- a/indra/newview/llfloaterbuycontents.cpp +++ b/indra/newview/llfloaterbuycontents.cpp @@ -43,7 +43,6 @@ #include "llcachename.h" #include "llagent.h" // for agent id -#include "llalertdialog.h" #include "llcheckboxctrl.h" #include "llinventoryfunctions.h" #include "llinventorymodel.h" // for gInventory |