svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26

Merging server-1.26 back to trunk.

Two conflicts -- llversionserver.hh (kept the trunk version)

and in llsimparcelmgr.cpp -- also kept the trunk version.  There was
                             some code in 1.26 that included error
                             printing from RDW that says "we should
                             really not be hitting this code", and that
                             code was gone in trunk... so, went ahead
                             and kept the trunk part of that one
                             conflict in that file.

0 files changed, 0 insertions, 0 deletions