Age | Commit message (Collapse) | Author |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
so if it breaks a build, just revert to the previous changeset.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
LinkInventoryItem in message_template.msg.
|
|
|
|
LinkInventoryItem.Merging newinventorymsg__merge__viewer-2.0.0-3__r131585 into viewer-2 trunk, see QAR-1804 and QAR-1805.
Merging revisions 131698-132325 of svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/newinventorymsg__merge__viewer-2.0.0-3__r131585 into D:\viewer-2.0.0-3, respecting ancestry
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30
Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804
|
|
Pilfered from billc.
|
|
Pulled all the sisa changes into trunk for QAR-1734
These changes are the same as revisions 126447:126495 from svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-2
or the one merge branch in
svn+ssh://svn.lindenlab.com/svn/linden/branches/bots/sisa-3
|
|
svn merge -r 128022:128028 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/server__merge__trunk-r127980 to svn+ssh://svn.lindenlab.com/svn/linden/trunk
This is the server-side merge for inventory links, folder links&types, and landmark&callingcard permissions.
|
|
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
|
|
The sets module is no longer needed with Python 2.4, and causes a
DeprecationWarning with 2.6, so drop it
The md5 module causes a DeprecationWarning with 2.6, so try to import
hashlib (its replacement) instead, else fall back
Reviewed by Poppy.
|
|
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.
|
|
svn+ssh://svn/svn/linden/branches/http_database/merge-03 into trunk. QAR-1462
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/cg/viewer-etch-1
QAR-1459 etch builds enabled
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/fix-lslrpc/fix-lslrpc-merge to svn+ssh://svn.lindenlab.com/svn/linden/trunk
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/http-texture/http-texture-10
DEV-8668 (llkdu) DEV-30348 (set development default channel to LindenDeveloper)
|
|
viewer also builds on etch
|
|
Reviewed by Brad.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
|
|
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) { }
|
|
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
prior to display. DEV-25457
|
|
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.
|
|
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
|
|
-r102882:102883 svn+ssh://svn.lindenlab.com/svn/linden/branches/windows-setup/windows-setup-3-merge
|
|
ignore that use error on cleanup.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
|
|
fixes) merge to trunk (for real)
|
|
|
|
fixes) merge to trunk
|