Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u

indra/llmessage/llassetstorage.cpp

indra/llmessage/llcachename.cpp

indra/llmessage/llhost.cpp

indra/llmessage/llhost.h

indra/llmessage/message.cpp

indra/llui/llurlentry.cpp

indra/llui/tests/llurlentry_stub.cpp

indra/newview/llagent.cpp

indra/newview/llfloatergodtools.cpp

indra/newview/llpreviewnotecard.cpp

indra/newview/llpreviewscript.cpp

indra/newview/lltexturefetch.cpp

indra/newview/llviewerobject.cpp

indra/newview/llviewertexture.h

indra/newview/llviewertexturelist.cpp

indra/newview/llvoavatar.cpp