diff options
| author | Robert Knop <prospero@lindenlab.com> | 2009-02-06 19:14:32 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2009-02-06 19:14:32 +0000 |
| commit | ea8e83274ae76598ff7a97eb50991e9f4826091b (patch) | |
| tree | 4754fa5a431c0470a3f25ac8f89d905c1c714700 /indra/lscript/lscript_http.h | |
| parent | 6861459c48f72bb714f307d44e59317a466887bc (diff) | |
svn merge -r 108748:109731 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
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)
Diffstat (limited to 'indra/lscript/lscript_http.h')
0 files changed, 0 insertions, 0 deletions