summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterauction.cpp
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-12-11 14:26:56 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-12-11 14:26:56 +0200
commit5aecd0b93f6d79ef447aca241b082f0fb468d78b (patch)
tree81dd8069b29ffaf5a468c5c32d3cf6415481fdb8 /indra/newview/llfloaterauction.cpp
parentce621eafd8a115cc6c13a124453bbbda1bc43e13 (diff)
parent4fc7b91a795fb4ad0eaf3b6c7a1779679889fcbf (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterauction.cpp')
-rw-r--r--indra/newview/llfloaterauction.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloaterauction.cpp b/indra/newview/llfloaterauction.cpp
index b63bcccf6b..c1a4a845e5 100644
--- a/indra/newview/llfloaterauction.cpp
+++ b/indra/newview/llfloaterauction.cpp
@@ -48,7 +48,6 @@
#include "llcombobox.h"
#include "llnotifications.h"
#include "llnotificationsutil.h"
-#include "llnotify.h"
#include "llsavedsettingsglue.h"
#include "llviewertexturelist.h"
#include "llviewerparcelmgr.h"