svn merge -r104838:107352 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

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.