# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/integration_tests/llui_libtest/CMakeLists.txt
#	indra/newview/CMakeLists.txt

The viewer currently presents a startling "Grid emergency" warning if an
unrecognized error is returned from login. Let's tone this down a bit
and present the error as it is: an unrecognized login failure rather
than SLearth exploding.

added missing app setting

Feature described at https://community.secondlife.com/blogs/entry/12652-coming-soon-to-a-viewer-near-you-group-chat-history/

following promotion of DRTVWR-570

This reverts commit 4d429b7e.

Multiple instances of viewer could write to the same uuid.inv file at the same time.

For some reason positioning IME window works fine, but disabling and enabling ime works from window's thread only

make_iterator_range doesn't verify errors, replaced with basic increments

NSPersistentUIFileManager is supposed to be responsible for restoring window position and size

# Conflicts:
#	autobuild.xml
#	indra/newview/llagent.cpp
#	indra/newview/llimview.cpp
#	indra/newview/llimview.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpanelmediasettingsgeneral.cpp
#	indra/newview/pipeline.cpp

Links can be drag and dropped so they should be movable via 'cut' as well

This reverts commit d6f5e5bc.

Revert of commit for SL-15401. Messages are supposed to handle 'mute' on their own.

Server sends updates in bulk now, so notify per agent instead of per update

Affects accent keys for diacritical marks

# Conflicts:
#	doc/contributions.txt
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llfloater360capture.cpp

following promotion of DRTVWR-565

Emulated mouse was trigering "not a valid zoomable object" case and jumping to garbage mMouseDownX/Y due to 'up' event being too early.