summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-02 12:32:56 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-02 12:32:56 -0400
commit873de2daae04a63c796661ff6d4db6aa912041bf (patch)
tree1e44c8c87fc8c86013a8843c572ec6fac4409eab /indra/newview/llimfloater.cpp
parent580ecaefcac2eb928c3dbdc9240e3fb54f3c989f (diff)
parenta7085418df1ada6e19b94b6df772ed21e663d119 (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 3ec8d11fb0..9704c7537a 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -58,7 +58,6 @@
#include "lltransientfloatermgr.h"
#include "llinventorymodel.h"
#include "llrootview.h"
-
#include "llspeakers.h"