merge

indra/llmath/llbbox.cpp

indra/llmath/llbbox.h

indra/llmessage/llregionflags.h

indra/newview/English.lproj/InfoPlist.strings

indra/newview/Info-SecondLife.plist

indra/newview/llviewermenu.cpp

indra/newview/llviewerobject.cpp

indra/newview/llviewerobject.h

indra/newview/llviewerparceloverlay.cpp

indra/newview/llviewerparceloverlay.h

indra/newview/llviewerregion.cpp

indra/newview/llviewerregion.h

indra/newview/res/viewerRes.rc