svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> release

indra/llmath/v3color.cpp

indra/llmath/v3color.h

indra/llmath/v4color.cpp

indra/llmath/v4color.h

indra/llrender/llfontgl.cpp

indra/llrender/llfontgl.h

indra/llui/llcombobox.cpp

indra/llui/llfloater.cpp

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/lltexteditor.cpp

indra/llui/lltexteditor.h

indra/newview/llfloatercolorpicker.cpp

indra/newview/llfloatercolorpicker.h

indra/newview/llpreviewscript.cpp

indra/newview/llpreviewscript.h