viewer.git/indra/llmessage/tests/lltestmessagesender.cpp, branch 26.1.1Megapahit's fork of the Second Life viewer.
https://megapahit.org/viewer.git/atom?h=26.1.12024-04-29T04:56:09Z#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed2024-04-29T04:56:09ZAndrey Lihatskiyalihatskiy@productengine.com2024-04-29T04:43:28Zurn:sha1:1b68f71348ecf3983b76b40d7940da8377f049b7remove execute permission from many files that should not have it2015-11-10T14:48:56ZOz Lindenoz@lindenlab.com2015-11-10T14:48:56Zurn:sha1:c8726aba303bcf1207b730a344536e25491420bcUpdate Mac and Windows breakpad builds to latest2013-03-29T14:50:08ZGraham Madaraszgraham@lindenlab.com2013-03-29T14:50:08Zurn:sha1:bf6182daa8b4d7cea79310547f71d7a3155e17b0Change license from GPL to LGPL (version 2.1)2010-08-13T11:24:57ZOz Lindenoz@lindenlab.com2010-08-13T11:24:57Zurn:sha1:06b0d72efa96b6a0ed665f7cd46f358c48929e7bmerge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-32009-06-21T08:04:56ZSteven Bennettssteve@lindenlab.com2009-06-21T08:04:56Zurn:sha1:9ec432034dc3c45d7ce763eb02dae4cc7f6b8da8
ignore-dead-branch
Fix licensing, also make the unzipping quieter, so that license error messages are easier to see in the log.2009-06-04T20:43:12ZChristian Goetzecg@lindenlab.com2009-06-04T20:43:12Zurn:sha1:a845b78268542e5a1147890c2b79a88e4ac93d62svn merge -r108815:112761 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.262009-02-25T21:02:17ZRobert Knopprospero@lindenlab.com2009-02-25T21:02:17Zurn:sha1:c88b470a8a2cdae8e69e5570b46d4b21c43368bc
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) { }