merge -r 56779:58057 /branches/selection_management

indra/llcommon/llmemory.cpp

indra/llcommon/llmemory.h

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llmenugl.cpp

indra/newview/llagent.cpp

indra/newview/llfloaterauction.cpp

indra/newview/llfloaterauction.h

indra/newview/llfloaterbuy.cpp

indra/newview/llfloaterbuy.h

indra/newview/llfloaterbuycontents.cpp

indra/newview/llfloaterbuycontents.h

indra/newview/llfloaterbuyland.cpp

indra/newview/llfloaterbuyland.h

indra/newview/llfloatercolorpicker.cpp

indra/newview/llfloatergodtools.cpp

indra/newview/llfloaterinspect.cpp

indra/newview/llfloaterinspect.h

indra/newview/llfloaterland.cpp

indra/newview/llfloaterland.h