diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-01-19 20:40:59 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-01-19 20:40:59 +0000 |
| commit | f1380f2fc3eecd8dfd2f75d053ff86716d5055f7 (patch) | |
| tree | 842470a9ff4341d09e1f7f9210aae0f6499fb4b1 /indra/llmessage/llxorcipher.cpp | |
| parent | 15a6d273cc00e1f4f9f9d56d8c878b46b283b289 (diff) | |
Merging from the server/server-1.25 branch
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)
Diffstat (limited to 'indra/llmessage/llxorcipher.cpp')
0 files changed, 0 insertions, 0 deletions