merging into latest changes

.hgtags

BuildParams

indra/cmake/00-Common.cmake

indra/cmake/GooglePerfTools.cmake

indra/llmath/lloctree.h

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/generate_breakpad_symbols.py

indra/newview/llchicletbar.cpp

indra/newview/llconversationmodel.cpp

indra/newview/llconversationmodel.h

indra/newview/llimconversation.cpp

indra/newview/llimconversation.h

indra/newview/llimfloater.cpp

indra/newview/llimfloater.h

indra/newview/llimfloatercontainer.cpp

indra/newview/llnearbychat.cpp

indra/newview/llnearbychat.h

indra/newview/llparticipantlist.cpp

indra/newview/llspatialpartition.cpp