summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-05-04 16:09:14 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-05-04 16:09:14 -0700
commita11ec0c89f618cb9d039274e850356694a28dbb1 (patch)
tree42f4e2637220af26a68dcf8acaa8dbf042082dbc /indra/newview/llimfloater.cpp
parent8daf25b65c30f58889ed5923d43bf785cb758026 (diff)
parent7d8b37f72488ce30503d97d88e804160b11c6eff (diff)
Automated merge
Diffstat (limited to 'indra/newview/llimfloater.cpp')
-rw-r--r--indra/newview/llimfloater.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp
index c0cc3f1985..46439150a7 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -59,7 +59,6 @@
#include "lltransientfloatermgr.h"
#include "llinventorymodel.h"
#include "llrootview.h"
-
#include "llspeakers.h"