livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Robert Knop f1380f2fc3 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)
 		2009-01-19 20:40:59 +00:00
..
cmake Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
copy_win_scripts QAR-767 Combined maint-render-7 and maint-viewer-9 merge 2008-08-12 17:29:50 +00:00
lib/python svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 2009-01-17 01:29:45 +00:00
linux_crash_logger Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llaudio Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcharacter Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llcommon Merging from the server/server-1.25 branch 2009-01-19 20:40:59 +00:00
llcrashlogger Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llimage Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llimagej2coj Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llinventory Merging from the server/server-1.25 branch 2009-01-19 20:40:59 +00:00
llmath svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 2009-01-13 03:46:56 +00:00
llmessage Merging from the server/server-1.25 branch 2009-01-19 20:40:59 +00:00
llprimitive Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llrender svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 2009-01-13 03:46:56 +00:00
llui svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 2009-01-13 03:46:56 +00:00
llvfs svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 2009-01-17 01:29:45 +00:00
llwindow Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
llxml Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
lscript svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 2009-01-17 01:29:45 +00:00
mac_crash_logger svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/ 2009-01-13 03:46:56 +00:00
mac_updater Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
newview svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113 2009-01-17 01:29:45 +00:00
test Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
tools/vstool DEV-16502 - Cleaned up error messages, better error handling in vstool/main.cs 2008-06-25 17:56:53 +00:00
win_crash_logger Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
win_updater Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
CMakeLists.txt QAR-1040 maint-viewer-11 + OpenAL combo mergeme 2008-12-02 20:35:40 +00:00
develop.py DEV-16956 - Print a more useful error message if cmake is not found 2009-01-09 22:28:17 +00:00