svn merge -c 112301 svn+ssh://svn.lindenlab.com/svn/linden/branches/sim-ao/sim-ao-4 propagate bandaid for DEV-27390

Merge-back of non-voice related viewer 1.22 RC8 changes to trunk.
QAR-1242

Merge server 1.25 back to trunk

Conflicts:

C    indra/llcommon/llversionserver.h  : svn reverted

C    indra/tools/bill/MoneyMachine.pm : one conflict, only difference
                                        was a blank line.

C    indra/newsim/lllslmanager.cpp : kept merge-right, in consultation
C    indra/newsim/lllslmanager.h   :   with babbage
C    indra/newsim/llagentinfo.cpp  : (runNested, not runSpecial)

C    indra/test/test_entity_query.py        : Kept merge-right
C    indra/test/test_agent_linden_dollar.py : Kept merge-right
                  --> Kartic fixed these testes in server-1.25

C    indra/test/template/httpd.tmpl : Kept merge-right
                                      (the IfModule version)

reasons):

svn merge -r109512:109516
svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-l10n/maint-l10n-3


DEV-22792 Russian and Ukrainian Viewer strings submission

DEV-24945 Chat console with scaled UI shows vertically misaligned
characters

DEV-25459 Viewer text-snapping is broken in a few ways

DEV-23475 Change the win32 viewer's font prioritization order to be more
Cyrillic-friendly

QAR-1042 Viewer in Russian, Ukrainian: need to verify that
French/German/Japanese/Korean were not effected by import of Russ and
Ukr.

secondlife-bin on Linux.

CMake will insert multiple -lndofdev parameters into the Makefile that
links secondlife-bin IFF ${NDOF_LIBRARY} is listed *after* Xinerama in
the target_link_libraries() call in indra/newview/CMakeLists.txt file.
Moving the reference to NDOF_LIBRARY above viewer_LIBRARIES seems to fix
it, and doesn't break Windows or MacOS.

Not reviewed.

Merge back of viewer 1.22 RC6 and RC7 change to trunk.
QAR-1214 and QAR-1227

svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.

version in trunk to 1.27.

svn merge -r108266:108604 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

One merge conflict, in indra/backbone/agent_linden_dollar.py, which was
very small, and resolved by Kartic & Prospero.

no conflicts

Still merging from server-1.25... one day I will catch up!

No conflicts

svn merge -r107352:108210
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Merge conflicts were resolved:

  scripts/start-server   : one conflict, kept the "working" version

  indra/llcommon/llversionserver.h : reverted
  indra/newview/Info-SecondLife.plist : reverted
  indra/newview/res/viewerRes.rc : reverted

  indra/newsim/llagentinfo.cpp : kept *both*... "working" had
      is_agent_online, which nothing else had, and the merge had
      isGodAllowed(), part of SEC resolution

  indra/backbone/agent_router.py : kartic & rdw merged and reviewed
      using brains and things

  indra/newsim/llsimhttpresponder.cpp : doesn't exist in trunk, and
      that's OK (even though there was a change for it)

svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113

merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.

Reviewed by Poppy.

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.

setting viewer to report 1.23.0, because code in trunk is well beyond 1.22 now and closer to what the 1.23 viewer will be

Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165

Fix for etch build.  Q and I both fixed LLDate by adding an operator!=() but we did it different ways so the two changes didn't cause a commit collision. I'm removing mine in favor of Q's.

svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 .  QAR-1149 -- Final merge of notifications to trunk.

Missed contributor for VWR-8430, DEV-18635.  Putting directly in trunk as this has already been merged from featurettes.

Change OKed with Q (the current lockholder) prospero, and robla.

make it easer for developers to examine list output by sorting the results prior to display. DEV-25457

svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge

Added a linux64 version of openal-soft for the etch build.
Not reviewed.

(1) the LLLand class had to be forward declared in a cpp file that did not include llland.h
(2) ensure_equals(const char*, type, type) requires that type have an operator!=(type, type) defined.
(3) ensure_equals(const char*, type, type) is so overloaded that the compiler can have trouble picking the right version when it has to implicitly cast a std::string to "const char*" AND multiple valid casts exist for type --> S32, F32, etc.  To solve this problem we must explicitly pass in a "const char*" instead of a std::string.
Reviewed with CG

Changed simulator cmake to use the new macros

QAR-1075 svn merge -r106114:106224 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel-stats-merge