fix files that do not end with a newline (warn-on-failure:copyright because some have both problems...)

English.lproj/language.txt must not have a newline in it.

warn-on-failure:eol-at-eof

.lproj/language.txt MUST NOT have a newline at the end, but the coding
policy hooks won't let me do this. Making a trivial change so that I can
undo it again with the relevant just-do-it flag.

But I want to be able to check in other commits...

Now LLUI::getLanguage() returns a result that is consistent on Mac,
Windows, and Linux. Also, cleaned up some legacy language code.

Port over the new build scripts from para-test, tweek update_version_files to use the repo revision number for now.

Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show

Merging from server-1.26 to trunk

Only a few conflicts:

   scripts/farm_distribute : the upload rate in trunk was even more
                             conservative than the one I switched to in
                             1.26, so kept the trunk version.

   indra/llcommon/llversionserver.h : did svn revert to keep trunk

   indra/newsim/lltask.cpp : svn is weird.  The merge conflict was one
                            that it's not obvious why it was there.
                            However, Simon and I looked at it, and the
                            solution was obvious : keep the trunk blob
                            where the conflict was flagged.

   indra/lib/python : conflict was differing versions of the eventlib
                      extern.  did svn revert . to keep trunk.

The biggest things in this are Scalable Space Servers and Maint-Server-6

QAR-1209 : SSS
QAR-1295 : maint-server-6

Conflicts resolved by prospero:

C    scripts/farm_distribute

C    scripts/automated_build_scripts/build-linux.sh : resolved by
                     prospero, mostly kept the merge-right version in
                     the conflict, but there was one block of repeated
                     code from earlier that I removed.

C    scripts/automated_build_scripts/build-mac.sh : kept merge-right

C    indra/llcommon/llversionserver.h : svn revert

C    indra/newsim/llsimparcel.h : kept *both*... working had "setArea",
                    merge-right had exportStream and importStream

C    indra/newsim/llsimparcel.cpp : see llsimparcel.h

C    indra/newsim/lltask.h : working had LLTask derived also from
                   LLScriptResourceConsumer, merge-right had LLTask
                   dervied also from LLAgentPosition.  To resolve
                   conflict, derive from both.

C    indra/newsim/lllslmanager.h : kept merge-right (had an added comment)

C    indra/llmessage/llhttpnode.h : kept working (added the definition
                   of method LLHTTPNode::extendedResult)

C    indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp
C    indra/lscript/lscript_execute_mono/llscriptexecutemono.h
                  : These two were resolved by si, in consultation with daveh


I also had to add the following stubs to
indra/newsim/tests/llgodkickutils_test.cpp in order to get it to
compile:

  // LLScriptResourceConsumer interface methods in LLTask
  LLScriptResource::LLScriptResource() { }
  LLScriptResourcePool::LLScriptResourcePool() { }
  LLScriptResourcePool LLScriptResourcePool::null;

  LLScriptResourceConsumer::LLScriptResourceConsumer() { }
  LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; }
  const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; }
  bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; }
  bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; }
  bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; }
  void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { }

  S32 LLTask::getUsedPublicURLs() const { return 0; }
  void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }

NOTE : also ran
  scripts/update_version_files.py --verbose --server --server_channel="Second Life Server"

to update server version information before doing a compile test.
Committed with the results of this version file update.

Conflicts resolved by prospero:

scripts/maintenance/update-groups.py  :  kept the trunk version (was
                                         merged from Rad Chillies)

scripts/make_deploy_group.py : merge by hand (I'm the one to do this,
                               anyway)

indra/llcommon/llversionserver.h : kept trunk version

indra/newsim/llgettaskstats.cpp : kept trunk version.  (svn revert)This
                                  was imported late into 1.25, after the
                                  branch merged into trunk, and no
                                  changes were made in the 1.25 branch
                                  after the import.

indra/newsim/llparcelstats.cpp : same as llgettaskstats.cpp
indra/newsim/llscriptcounter.h : same as llgettaskstats.cpp

indra/newsim/llagentinfo.cpp : like llgettaskstats.cpp, but more
                               complicated as some of soft's God-logging
                               that came from 1.24->1.25 was in here.
                               Fortunately, the conflict was trivial
                               (missing include)

idnra/newsim/simulator.cpp : one small conflict.  Kept the 1.25 version
                             of SKU/product stuff, as it was likely part
                             of the homestead stuff that was recently
                             put into 1.25.  However, there was some
                             code after that in the merge conflict that
                             had been removed from trunk that I also
                             removed in the resolution.  This code is 27
                             lines starting at the comment "Asset cache
                             service", as can be found in the
                             server-1.25 branch.

indra/newsim/tests/fakeobjects.h : kept the trunk version.  No changes
                                   to 1.25 after parcel stats merge,
                                   except for a compile error fixed by
                                   andrew about which he warned there
                                   would be merge issues...

indra/newsim/tests/llgettaskstats_test.cpp : same as llgettaskstats.cpp
indra/newsim/tests/lllslmanager_tests.cpp : same as llgettaskstats.cpp
indra/newsim/tests/llparcelstats_test.cpp : same as llgettaskstats.cpp
indra/newsim/llgettaskstats.h : same as llgettaskstats.cpp
indra/newsim/llparcelstats.h : same as llgettaskstats.cpp

indra/newsim/llscriptdata.cpp : same as llgettaskstats.cpp, except for a
                                fix that josh made both to trunk and
                                1.25
indra/newsim/llscriptdata.h : same as llscriptdata.cpp

indra/newsim/llscriptcounter.cpp : same as llgettaskstats.cpp

indra/newsim/CMakeLists.txt : similar to llgettaskstats.cpp, except that
                              there was an additional change to trunk
                              (so doing "svn revert" to keep trunk is
                              still the right thing)

indra/backbone/multiagentchat.py : where there were conflicts, kept the
                                   server-1.25 version.  Phoenix had put
                                   in some fixes for dealing with
                                   omissions of the accept header in the
                                   1.25 branch.

indra/backbone/group_linden_dollar.py : similar to multiagentchat.py.
                                        All but one or two conflicts
                                        were utterly trivial (missing
                                        blank line)

indra/backbone/agent_linden_dollar.py : all merge conflicts were utterly
                                        trivial (missing blank line);
                                        I'm surprised svn got all fussy
                                        about them.

indra/lib/python : conflict was because the externals had been futzed
                   with in 1.25 during debugging of backbone memory
                   bloat.  Kept the externals as in trunk.

svn merge -r96886:98039 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release

svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-r93014-qar633 dataserver-is-deprecated

merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release

QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)

DEV-11202: Unhandled Excpetion in pipeline.cpp.
Merged over updated windlight ui help text from windlight14.
Reverting a const change in a virtual that was not propagated to all overrides.
DEV-10957 stop and pause Media and music buttons do not work
DEV-10762 Displayed page in the client browser disappears when crossing property boundaries.
DEV-11220 replace misspellings in alerts.xml parameters of 'messsage'
DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip
DEV-11193 clean up some viewer strings related to Windlight help text
svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads
DEV-11110  	 Media browser history dropdown does not save items across sessions
Ran the xuiparse -process tool on all en-us xml files.  This does NOT change any data, merely reorders attributes and cleans up tab/spacing.
DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files
DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown
dev-10623 "parcels that played movies no longer work in combo-merge-ui"
DEV-11379 - crash in LLTabContainer::draw()
DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview
DEV-11158 sculpties on the top10 crash list
DEV-11404 "Send Current URL to Parcel" does not set the MIME type
merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database.
DEV-10489: no draw distance cheating
DEV-879: water noise frequency
DEV-10764: macbook air support
DEV-10878: Linux Intel945 support
DEV-7551: featuretable adjustments for framerate.
DEV-11426 Enormous mini-map.
DEV-11505 - Crash in gunzip_file.
Removed final LinkedList, SkipMap, and AssocList templates from the Viewer!
DEV-11115  truncated word in the Advanced Water Editor's modal help dialog