BUILDFIX - miscellaneous stuff missed in the merge

indra/llui/llmodaldialog.cpp

indra/llui/llmultifloater.cpp

indra/llui/llmultifloater.h

indra/llxml/llcontrol.h

indra/newview/llfasttimerview.cpp

indra/newview/llfasttimerview.h

indra/newview/llfloaterimcontainer.cpp

indra/newview/llpersistentnotificationstorage.cpp

indra/newview/llscenemonitor.cpp

indra/newview/llscenemonitor.h

indra/newview/llsceneview.cpp

indra/newview/llsceneview.h

indra/newview/llvoavatar.cpp