summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewscript.cpp
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-01-20 15:30:07 -0800
committerCallum Prentice <callum@lindenlab.com>2010-01-20 15:30:07 -0800
commit8aadfb1cb63a9527835c6c5127d041d924455505 (patch)
tree3fd5f231cae133ec25f0d0d4bf9eda53d0d4c0e4 /indra/newview/llpreviewscript.cpp
parent622f8b59ceb286f955351b6185a98919f03ed136 (diff)
parent20af2d325a4340aca997efbea752849e9f15d041 (diff)
Merge with tip
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
-rw-r--r--indra/newview/llpreviewscript.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 646c9fb6a4..fccf71f3cb 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -79,7 +79,6 @@
#include "llslider.h"
#include "lldir.h"
#include "llcombobox.h"
-//#include "llfloaterchat.h"
#include "llviewerstats.h"
#include "llviewertexteditor.h"
#include "llviewerwindow.h"