summaryrefslogtreecommitdiff
path: root/indra/llmessage
AgeCommit message (Collapse)Author
2009-06-29Merge with viewer-2.0.0-3Bryan O'Sullivan
2009-06-24merge -r125267:125272 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/inventory-links__merge__viewer2.0.0-3-r125202 to svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
2009-06-23Removed conflict markers (ie. <<<<<<<) in llmessage/CMakeLists.txtMark Palange (Mani)
Copied snprintf declaration in llstring from login-api-3
2009-06-23Resolve mergeNat Goodspeed
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-23Fixed an "ADD_BUILD_TEST" leftover from the initial merge.palange@becane.lindenlab.com
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-22QAR-1383: convert new uses of Boost.Signals (arriving from other branches) toNat Goodspeed
Boost.Signals2 like the rest of the event-system-n code.
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-06-19result of "svn merge -r123757:124890 ↵Paul Oppenheim
svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
2009-06-19DEV-31980: extract dispatch-by-string-name logic from LLAresListener to newNat Goodspeed
LLEventDispatcher and LLDispatchListener classes. See LLAresListener for example usage.
2009-06-04Fix licensing, also make the unzipping quieter, so that license error ↵Christian Goetze
messages are easier to see in the log.
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-05-27DEV-31979: Introduce LLReqID, a class to help individual event API listenersNat Goodspeed
implement the ["reqid"] convention. This convention dictates that a response LLSD from each such API should contain a ["reqid"] key whose value echoes the ["reqid"] value, if any, in the request LLSD. Add LLReqID support to LLAresListener's "rewriteURI" service, LLSDMessage, LLCapabilityListener and LLXMLRPCListener.
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
Ok, finally got this to a point where it doesn't break the build and I can check in. llcommon can be built as a shared library (disabled but can be enabled with cmake cache var LLCOMMON_LINK_SHARED. reviewed by Mani on tuesday (I still need to get his suggested changes re-reviewed)
2009-05-19svn merge -r118673:120720 ↵Robert Knop
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.
2009-05-18Result of svn merge -r119432:120464 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
2009-05-11svn merge -r113003:119136 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3
2009-05-08svn merge -r114679:114681 ↵Nat Goodspeed
svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-7 svn+ssh://svn.lindenlab.com/svn/linden/branches/event-system/event-system-8
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
svn merge -r118927:118939 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476 this is a composite of... svn merge -r115088:118182 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23 conflicts resolved: C doc/contributions.txt C indra/llaudio/audioengine.cpp C indra/newview/CMakeLists.txt C indra/newview/llfloaterlandholdings.cpp C indra/newview/llpaneldirbrowser.cpp C indra/newview/llpanelgrouplandmoney.cpp C indra/newview/llpreviewscript.cpp C indra/newview/llviewermenu.cpp C indra/newview/skins/default/xui/en-us/notifications.xml and... svn merge -r116937:118673 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 minor-to-trivial conflicts resolved: C indra/llcommon/llversionserver.h C indra/newsim/llrezdata.cpp C indra/newsim/llstate.cpp C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-04-21svn merge -r117696:117697 ↵Kelly Washington
svn+ssh://svn.lindenlab.com/svn/linden/branches/fix-lslrpc/fix-lslrpc-merge to svn+ssh://svn.lindenlab.com/svn/linden/trunk
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-09svn merge -r115000:116937 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merging from server-1.26 to trunk Only a few conflicts: scripts/farm_distribute : the upload rate in trunk was even more conservative than the one I switched to in 1.26, so kept the trunk version. indra/llcommon/llversionserver.h : did svn revert to keep trunk indra/newsim/lltask.cpp : svn is weird. The merge conflict was one that it's not obvious why it was there. However, Simon and I looked at it, and the solution was obvious : keep the trunk blob where the conflict was flagged. indra/lib/python : conflict was differing versions of the eventlib extern. did svn revert . to keep trunk.
2009-03-20svn merge -r113004:115000 ↵Dave Simmons
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge latest 1.26 into trunk
2009-03-09svn merge -r113780:113785Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/gst3-t113732 QAR-1333 linux gstreamer compatibility improvements and ADD_BUILD_TEST improvements - combo merge
2009-03-05revert revision 113792. wrong branchAaron Brashears
2009-03-05bail if data_size is zero. crashes windows application since it throws an ↵Aaron Brashears
exception. undefined behavior is undefined. DEV-28045
2009-03-02Clean up use of tutBryan O'Sullivan
2009-03-02Fix licenses of exported files, reviewed by daveHChristian Goetze
2009-02-25svn merge -r108815:112761 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 The biggest things in this are Scalable Space Servers and Maint-Server-6 QAR-1209 : SSS QAR-1295 : maint-server-6 Conflicts resolved by prospero: C scripts/farm_distribute C scripts/automated_build_scripts/build-linux.sh : resolved by prospero, mostly kept the merge-right version in the conflict, but there was one block of repeated code from earlier that I removed. C scripts/automated_build_scripts/build-mac.sh : kept merge-right C indra/llcommon/llversionserver.h : svn revert C indra/newsim/llsimparcel.h : kept *both*... working had "setArea", merge-right had exportStream and importStream C indra/newsim/llsimparcel.cpp : see llsimparcel.h C indra/newsim/lltask.h : working had LLTask derived also from LLScriptResourceConsumer, merge-right had LLTask dervied also from LLAgentPosition. To resolve conflict, derive from both. C indra/newsim/lllslmanager.h : kept merge-right (had an added comment) C indra/llmessage/llhttpnode.h : kept working (added the definition of method LLHTTPNode::extendedResult) C indra/lscript/lscript_execute_mono/llscriptexecutemono.cpp C indra/lscript/lscript_execute_mono/llscriptexecutemono.h : These two were resolved by si, in consultation with daveh I also had to add the following stubs to indra/newsim/tests/llgodkickutils_test.cpp in order to get it to compile: // LLScriptResourceConsumer interface methods in LLTask LLScriptResource::LLScriptResource() { } LLScriptResourcePool::LLScriptResourcePool() { } LLScriptResourcePool LLScriptResourcePool::null; LLScriptResourceConsumer::LLScriptResourceConsumer() { } LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() { return LLScriptResourcePool::null; } const LLScriptResourcePool& LLScriptResourceConsumer::getScriptResourcePool() const { return LLScriptResourcePool::null; } bool LLScriptResourceConsumer::switchScriptResourcePools(LLScriptResourcePool& new_pool) { return false; } bool LLScriptResourceConsumer::canUseScriptResourcePool(const LLScriptResourcePool& resource_pool) { return false; } bool LLScriptResourceConsumer::isInPool(const LLScriptResourcePool& resource_pool) { return false; } void LLScriptResourceConsumer::setScriptResourcePool(LLScriptResourcePool& pool) { } S32 LLTask::getUsedPublicURLs() const { return 0; } void LLTask::setScriptResourcePool(LLScriptResourcePool& pool) { }
2009-02-24merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunkKelly Washington
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 ↵Brad Kittenbrink
(maint-render-9) and QAR-1236 (dll-msvcrt-2) svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-06svn merge -r 108748:109731 ↵Robert Knop
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)
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
2009-01-22Merging from production branch to trunkRobert Knop
svn merge -r108266:108604 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 One merge conflict, in indra/backbone/agent_linden_dollar.py, which was very small, and resolved by Kartic & Prospero.
2009-01-19svn merge -r108243:108266 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 no conflicts
2009-01-19svn merge -r108236:108243 ↵Robert Knop
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Still merging from server-1.25... one day I will catch up! No conflicts
2009-01-19Merging from the server/server-1.25 branchRobert Knop
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-17svn merge -r108142:108148 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-5-r108113
2009-01-08svn merge -r104838:107352 ↵Robert Knop
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.
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-15svn merge -r105329:105903 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4
2008-12-04Merging from server/server-1.25 back to trunk.Robert Knop
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25 Conflicts resolved by Prospero, except for one scary conflict in SendConfirmationEmail.php which was resolved by jarv.
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
svn merge -c104451 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-01svn merge -r103586:104391 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/maint-server-4-sandbox-r103546 Picking up the following bug fixes: DEV-19747 Flooding sim with bogus animation packets crashes sim DEV-20978 Investigate baked avatar texture caching in simulator - ids not properly stored DEV-5316 llsd-get .../runtime/top and "World:Region/Estate:Debug:Get Top Scripts" broken DEV-18807 SVC-2596: Script dataserver events become permanently blocked until sim restart DEV-19108 SVC-2616: Torus refuses to accept 180 degree texture rotation DEV-9944 Simulator crash failing to write simstate to file .tmp.tmp DEV-21439 Configure VFS file size via simulator.xml
2008-11-21Merging the changes in viewer_1-22-0 (1.22 RC0) back into trunk, revs. ↵Mark Palange
101837 to 103519
2008-11-18QAR-963 svn merge -r101685:101752 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/rad-chilies/rc05-release-merge
2008-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-10-17DEV-22360 - Interim fix for VWR-9784: Unable to upload scripts - this will ↵Brian McGroarty
be replaced later with final code, but we need to unblock release
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 03:16:26 +0000