- Apr 29, 2024
-
-
Andrey Lihatskiy authored
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
-
- Aug 10, 2021
-
-
Rye Mutt authored
-
- Jun 26, 2021
-
-
Rye Mutt authored
-
- Dec 17, 2020
-
- Nov 11, 2020
-
-
Rye Mutt authored
-
- Oct 10, 2020
-
- Oct 08, 2020
-
-
Rye Mutt authored
-
- Aug 09, 2020
-
-
Rye Mutt authored
-
- Nov 10, 2015
-
-
Oz Linden authored
-
- Aug 09, 2013
-
-
Richard Linden authored
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
-
- May 05, 2013
-
-
Richard Linden authored
-
- Mar 29, 2013
-
-
Graham Madarasz authored
-
- Nov 15, 2012
-
-
Richard Linden authored
cleaning up build moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc streamlined Time class and consolidated functionality in BlockTimer class llfasttimer is no longer included via llstring.h, so had to add it manually in several places
-
- Jul 13, 2011
-
-
Logan Dethrow authored
-
- Jun 28, 2011
-
-
Logan Dethrow authored
Renamed llsocks5.cpp to llproxy.cpp.
-
- Jun 22, 2011
-
-
Logan Dethrow authored
-
- Jun 21, 2011
-
-
Logan Dethrow authored
-
- Jun 10, 2011
-
-
Logan Dethrow authored
STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on Linden Coding Standard and comments in the code review.
-
- Mar 28, 2011
-
-
Robin Cornelius authored
-
- Oct 13, 2010
-
-
Oz Linden authored
-
- Sep 21, 2010
-
-
Brad Payne (Vir Linden) authored
-
- Aug 13, 2010
-
-
Oz Linden 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 19, 2009
-
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25Robert Knop authored
no conflicts
-
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25Robert Knop authored
Still merging from server-1.25... one day I will catch up! No conflicts
-
- 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
-
- May 14, 2008
-
-
Eric Tulla authored
Passed QA as part of QAR-491.
-
- 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.
-
- Jul 02, 2007
-
- Jun 21, 2007
-
-
Kelly Washington authored
-
- May 01, 2007
-
- Feb 02, 2007
-
- Jan 03, 2007
-
-
svn+ssh://svn.lindenlab.com/svn/linden/release@56429Josh Bell authored
svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
-
- Jan 02, 2007
-
-
James Cook authored
-