Undid previous commit (bogus merge)

indra/llcommon/llapp.cpp

indra/llcommon/llapp.h

indra/llcommon/llversionviewer.h

indra/newview/app_settings/cmd_line.xml

...wview/app_settings/shaders/class1/environment/waterF.glsl

indra/newview/featuretable.txt

indra/newview/gpu_table.txt

indra/newview/llappviewer.cpp

indra/newview/llappviewerlinux.cpp

indra/newview/llappviewerlinux.h

indra/newview/llappviewermacosx.cpp

indra/newview/llappviewermacosx.h

indra/newview/llappviewerwin32.cpp

indra/newview/llappviewerwin32.h

indra/newview/lldebugview.cpp

indra/newview/llfloatercamera.cpp

indra/newview/llfloaterlagmeter.cpp

indra/newview/llfloaterlagmeter.h

indra/newview/llfloaterpreference.cpp

indra/newview/llmoveview.cpp