merge

indra/llcommon/llsdutil.cpp

indra/llinventory/llinventory.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llinventorymodel.cpp

indra/newview/llinventorymodel.h

indra/newview/llviewerinventory.cpp

indra/newview/llviewerinventory.h

indra/newview/llviewerregion.cpp

indra/newview/llviewerstats.cpp

indra/newview/llviewerstats.h

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoavatarself.cpp