- Jun 13, 2018
-
-
Brad Payne (Vir Linden) authored
-
- Nov 10, 2015
-
-
Oz Linden authored
-
- Mar 29, 2013
-
-
Graham Madarasz authored
-
- Oct 13, 2010
-
-
Oz Linden authored
-
- Sep 21, 2010
-
-
Brad Payne (Vir Linden) authored
-
- Aug 23, 2010
-
-
Loren Shih authored
-
- Aug 13, 2010
-
-
Oz Linden authored
-
- Feb 28, 2010
-
-
David Parks authored
Add LH transform to LLVector3 Add DebugShowUploadCost Make LOD generation on model preview less finnicky. Remove error level based LOD generation. Better framing of model before upload. Better error handling for model uploader. Remove [COST] argument from model upload menu item. Remove L$ check from model upload menu item being enabled.
-
- Oct 08, 2009
-
-
Adam Moss authored
DEV-41080 - wriggle some method implementations out into header implementations, just enough so that llbboxlocal can be a unit test rather than an integration test. Slightly dubious about whether it's worth it.
-
- Jun 21, 2009
-
-
Steven Bennetts authored
-
- Apr 08, 2009
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26Robert Knop authored
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.
-
- Feb 25, 2009
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26Robert Knop authored
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) { }
-
- Jan 07, 2009
-
-
Aaron Brashears authored
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
-
- Jul 23, 2008
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-mergeKarl Steifvater authored
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
-
- Jul 22, 2008
-
-
svn+ssh://svn.lindenlab.com/svn/linden/releaseJosh Bell authored
Undo r92710 (for QAR-698) - went straight into release instead of a side branch for validation.
-
Karl Steifvater authored
svn merge -r92602:92632 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-4
-
- Jun 25, 2008
-
-
Steven Bennetts authored
dataserver-is-deprecated
-
Dave Simmons authored
QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
-
- Apr 03, 2008
-
-
Kelly Washington authored
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
-
- Oct 04, 2007
-
-
Aaron Brashears authored
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
-
- Mar 02, 2007
-
-
Steven Bennetts authored
-
- Feb 07, 2007
-
-
Andrew Meadows authored
Moved the LLSD related methods of LLVector3 to NOT be inline, as per MarkL's suggestion.
-
- Jan 02, 2007
-
-
James Cook authored
-