merge

.hgtags

doc/contributions.txt

indra/llcommon/llsd.cpp

indra/llcommon/llsd.h

indra/llmessage/llsdmessagereader.cpp

indra/llwindow/llwindow.cpp

indra/llwindow/llwindow.h

indra/llwindow/llwindowheadless.h

indra/llwindow/llwindowmacosx.cpp

indra/llwindow/llwindowmacosx.h

indra/llwindow/llwindowmesaheadless.h

indra/llwindow/llwindowsdl.cpp

indra/llwindow/llwindowsdl.h

indra/llwindow/llwindowwin32.cpp

indra/llwindow/llwindowwin32.h

indra/newview/character/avatar_lad.xml

indra/newview/llfloaterinspect.cpp

indra/newview/llfloaterinspect.h

indra/newview/lloverlaybar.cpp

indra/newview/lloverlaybar.h