Merge

.hgtags

indra/llcommon/llassettype.h

indra/llinventory/llfoldertype.cpp

indra/llinventory/llfoldertype.h

indra/llmessage/llhttpclient.cpp

indra/llmessage/llhttpclient.h

indra/llui/llcommandmanager.cpp

indra/llui/llcommandmanager.h

indra/llui/llfolderview.cpp

indra/llui/llfolderviewitem.cpp

indra/llui/llfolderviewitem.h

indra/llui/llfolderviewmodel.h

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/commands.xml

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llconversationmodel.h

indra/newview/llfloatermarketplacelistings.cpp

indra/newview/llfloatermarketplacelistings.h