summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj/llimagej2coj.cpp
AgeCommit message (Collapse)Author
2011-04-04STORM-746 : add precincts and blocks arguments taken into account in j2c outputMerov Linden
2011-04-04STORM-746 : add new arguments for precincts and blocks on output, region and ↵Merov Linden
level on input, add code for input loading restriction
2010-12-24STORM-744 : Took code review into account, moving stuff back in protected or ↵Merov Linden
even private, fix things to work in debug mode, some clean up in j2coj also
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-02-03CID-261Tofu Linden
Checker: UNINIT_CTOR Function: LLImageJ2COJ::LLImageJ2COJ() File: /indra/llimagej2coj/llimagej2coj.cpp
2009-11-06EXT-2215 - Viewer crashes while trying to decode imageSteve Bennetts
llwarns is not entirely thread safe. Need to fix that, but for now, use LL_DEBUGS instead.
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
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-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
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-05-08QAR-570 maint-render-4 mergeSteven Bennetts
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
QAR-389
2007-12-29svn merge -r 76642:76643 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-4-merge-76640 Redo of QAR-170, with correct range. Reviewed by CG.
2007-10-11Merge maint-viewer @ r71064Brian McGroarty
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-09-28EFFECTIVE MERGE: svn merge -r 68999:69916 ↵Don Kjer
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance into release ** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release ** ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556 RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 ↵Christian Goetze
svn+ssh://svn/svn/linden/branches/maintenance into release Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-04-04svn merge -r 59826:59968 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-31svn merge -r 59364:59813 ↵Josh Bell
svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-16SL-35314 - fix many openjpeg woes. QA'd.Adam Moss
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@58887 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-35314-based-on-r58887 --> release
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-10svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 ↵Jon Wolk
svn+ssh://svn.lindenlab.com/svn/linden/branches/abstract-kdu@56647 --ignore-ancestry
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 12:20:44 +0000