Merge conflict resolution for previous commit.

indra/newview/CMakeLists.txt

indra/newview/llagentwearables.cpp

indra/newview/llassetuploadresponders.cpp

indra/newview/llfloaterbuy.cpp

indra/newview/llfloaterbuycontents.cpp

indra/newview/llfloatergesture.cpp

indra/newview/llfloaterinventory.cpp

indra/newview/llfloaterinventory.h

indra/newview/llfloateropenobject.cpp

indra/newview/llfloateropenobject.h

indra/newview/llfloatertools.cpp

indra/newview/llfolderview.cpp

indra/newview/llimpanel.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventoryfunctions.cpp

indra/newview/llinventoryfunctions.h

indra/newview/llinventorymodel.cpp

indra/newview/llpanelcontents.cpp

indra/newview/llpanelcontents.h