summaryrefslogtreecommitdiff
path: root/indra/newview/llimfloater.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-03-01 15:31:04 -0800
committerRoxie Linden <roxie@lindenlab.com>2010-03-01 15:31:04 -0800
commitb11a625e6ff89470d25273fa426ed13f7abc4a6a (patch)
treea5e923a8211926f119f1cf45ded6cd4222c9250b /indra/newview/llimfloater.cpp
parent6575b685e91d334198789c88dec2efab7e5a1ac9 (diff)
parenta2efe4bb4154b7ecb9c7cb279f7a28d7d401a93a (diff)
Automated merge with a few fixups for code review comments
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 8cdc50eb70..9625b1ae2c 100644
--- a/indra/newview/llimfloater.cpp
+++ b/indra/newview/llimfloater.cpp
@@ -57,7 +57,6 @@
#include "lltransientfloatermgr.h"
#include "llinventorymodel.h"
#include "llrootview.h"
-
#include "llspeakers.h"