summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2009-11-28Migrated LLUUIDs and some float constants out of headers into .cpp filesJames Cook
Moved some functions with llinfos into .cpp files Linker optimizations, all
2009-11-10Fix for Windows compile error.Steve Bennetts
2009-11-10FIX DEV-41949: LLMediaEntry::setWhitelist() and LLMediaEntry::asLLSD() have ↵Rick Pasetto
a contract conflict Review #32 This code will go into both server 1.32 branch and the viewer branch. As proposed in DEV-41949, I've changed setWhitelist(const LLSD &whitelist) to clear the whitelist if the WHITELIST_KEY is not present in the passed-in 'whitelist'. I've also made sure that asLLSD() ensures that the WHITELIST_KEY is erased in the given LLSD.
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-10-19mergeSteve Bennetts
2009-10-16svn merge -r134817:136516 ↵Loren Shih
svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 For DEV-32867 : Avatar Pipeline Project - Multi-Attachments This is a viewer-side-only, infrastructure-only merge for multi-attachments. This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly. Reviewed by: Vir.
2009-10-07Merged latest viewer/login-api with latest viewer/viewer-20brad kittenbrink
2009-10-05FIX DEV-40877: ignore changes from "bad" objects which have an invalid media URLRick Pasetto
2009-10-05merge with latest from lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-04Changed license to Viewer GPL to try to fix the Linux build export. Code ↵James Cook
consists of 4 function stubs, I don't think it's proprietary/internal.
2009-10-02Patches follow merge to latest viewer-20 updatesMark Palange (Mani)
2009-10-02merge of latest viewer/viewer-20Mark Palange (Mani)
2009-10-01merge of latest lindenlab/svn-imports-viewer-20Mark Palange (Mani)
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-09-30QAR-1619: merge up to 2009-09-26 viewer/viewer-20Nat Goodspeed
2009-09-26Merge into viewer/viewer-20 yesterday's lindenlab/svn-imports-viewer-20Nat Goodspeed
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-01Fix up some more post-merge breakage.brad kittenbrink
2009-08-31Merge with trunkBryan O'Sullivan
2009-07-29svn merge -r128774:128808 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1737Christian Goetze
effective merge: svn merge -r127126:128746 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27
2009-07-15svn merge -r126867:127217 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1691Christian Goetze
Effective merge: svn merge -r125827:127126 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.27 QAR-1691
2009-07-07svn merge -r 126003:126087 ↵Don Kjer
svn+ssh://svn/svn/linden/qa/light-texture-params/light-texture-params-2 into trunk
2009-07-01svn merge -r125825:125901 svn+ssh://svn.lindenlab.com/svn/user/cg/qar-1654Christian Goetze
QAR-1654 merge completed.
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
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-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-04-01QAR-1284 ip-takedown tools simulator work is ready for mergeAndrew Meadows
svn merge -r115879:116020 svn+ssh://svn.lindenlab.com/svn/linden/branches/dmcat/dmcat-5 no conflicts
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-03svn merge -r107016:108767 ↵Mark Palange
svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewer_1-22 Merge back of viewer 1.22 RC6 and RC7 change to trunk. QAR-1214 and QAR-1227
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-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-10-10svn merge -r99056:99248 ↵Andrew Meadows
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2008-06-02svn merge -r88066:88786 ↵Bryan O'Sullivan
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
merge release-QAR-508 Viewer 1.20 RC 4 merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-03Fix mac build from havok4 merge.Kelly Washington
2008-04-03svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/releaseKelly Washington
HAVOK4 IN TEH HOUSE!!11!!ONE!! If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this. QAR-448
2008-03-11merge Branch_1-19-1-Viewer -r 80930 : 81609 -> releaseSteven Bennetts
DEV-11202: Unhandled Excpetion in pipeline.cpp. Merged over updated windlight ui help text from windlight14. Reverting a const change in a virtual that was not propagated to all overrides. DEV-10957 stop and pause Media and music buttons do not work DEV-10762 Displayed page in the client browser disappears when crossing property boundaries. DEV-11220 replace misspellings in alerts.xml parameters of 'messsage' DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip DEV-11193 clean up some viewer strings related to Windlight help text svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads DEV-11110 Media browser history dropdown does not save items across sessions Ran the xuiparse -process tool on all en-us xml files. This does NOT change any data, merely reorders attributes and cleans up tab/spacing. DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown dev-10623 "parcels that played movies no longer work in combo-merge-ui" DEV-11379 - crash in LLTabContainer::draw() DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview DEV-11158 sculpties on the top10 crash list DEV-11404 "Send Current URL to Parcel" does not set the MIME type merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database. DEV-10489: no draw distance cheating DEV-879: water noise frequency DEV-10764: macbook air support DEV-10878: Linux Intel945 support DEV-7551: featuretable adjustments for framerate. DEV-11426 Enormous mini-map. DEV-11505 - Crash in gunzip_file. Removed final LinkedList, SkipMap, and AssocList templates from the Viewer! DEV-11115 truncated word in the Advanced Water Editor's modal help dialog
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2007-12-05EFFECTIVE MERGE: svn merge -r 71520:73420 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance-3 into release ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-10-11EFFECTIVE MERGE: svn merge -r 69928:70806 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-08-30Merge sl-search-opt-in back into the release branchSam Kolb
Reviewed by Josh and Don
2007-08-16merge -r67812:67818 ↵Karl Steifvater
svn+ssh://svn.lindenlab.com/svn/linden/branches/windlight-server/ --> release
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release
2007-05-23svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@62339 ↵Brad Kittenbrink
svn+ssh://svn.lindenlab.com/svn/linden/branches/release-candidate62341 -> release
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release