| Age | Commit message (Collapse) | Author |
|---|
|
- Added unit tests for LLRect and LLBBoxLocal in indra/test
- Moved newview/LLBBox to llmath, and added unit tests for it
- Removed methods in llbboxlocal.h and llbbox.h that were not
actually implemented (declared in .h, but not defined in cpp)
Reviewed by babbage.
|
|
ignore-dead-branch
|
|
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
|
|
|
|
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) { }
|
|
|
|
(maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/sim-ao/sim-ao-4 propagate bandaid for DEV-27390
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/andrew/gcc-4-003-for-merge
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
|
|
builds. Not reviewed, mailed to cmake@. Pretty minor, not destructive. Also removing test lldatabase_tut on mac for DEV-14371 until theres a sane way to do connection checking. I could be wrong on this one.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
From 1.23:
* DEV-18788 SEC-136: Avatars Link as links instead of sits
* DEV-18754 Instant simulator crash using llUnescapeURL
* QAR-780 Test the viewer crash reporter in branch crashlogger_vc8@92961
* login.cgi foo by billc
* DEV-18732 QA the flow for first landing location change: Help Island + Browser Tutorial
* Added email notification of crashloganalyzer.py failures
* QAR-802 / DEV-19069 - merge maint-webds-1-23 to Branch_1-23-Server
* removed obsolete start-location code
Backport fixes from UPCOMING production branch:
* DEV-19031 Crash in new Mono code when one object rezzes another with active script
* DEV-19050 SVC-2745: llSetLinkPrimitiveParams misbehaving on 1.23 server if avatar is near ground
* DEV-16129 Break getStartLocation timeout apart from rest of teleport request failure metric
* DEV-14270 Add a column to tp metric to differentiate teleports, local teleports, and region_crossings
* DEV-18965 Unable to save scripts when running a sim on windows.
* DEV-17376 some region links in Search teleport you without warning
* DEV-17796 Sim performance decreases a lot with rezzing physical objects
* DEV-19142 SVC-2773: Mono Beta: Script editor "Save" does not save scripts containing syntax errors
* Switched serialized data to a vector instead of a GCed Mono array
* Made update of cache explicit
* Added heartbeats during long derezzes and deletes to stop the launcher killing the sim
* DEV-15010 include agent_id in search metrics
* DEV-15011 Search metrics not including non 'CLASSIFIED' and 'PLACE' search types
* DEV-19288 Broken webservices in 1.24
* DEV-18957 : SCUT : Enable test.py to run tests again a grid database
* Remove leading whitespace to work around bug DEV - 19276 (this is NOT a fix for that bug)
dataserver-is-deprecated-yo
|
|
|
|
--> release
Effectively:
svn merge -r 87048:88773 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server
* Plus some gcc4.x fixes
In detail:
* Bump version numbers to 1.22.0 Server
* Updated files for enabled conductor.
* Added tarball pulling during deploy for central servers.
* DEV-15160 Logins not remembering start location on beta grid
* DEV-15167 Random failure with set-classified-stats
* DEV-15193 Viewer Passing Through Unsanitized Strings to DB when creating classifieds.
* Add --location to the curl invocation in fetch_agni_ws_snapshot
* QAR-609 Some Havok4 bug fixes
* QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe
* DEV-14704 1.21.1.86182 revealing hidden groups in profile
* DEV-14641 Change automated Subject Line messages for IM-to-Email to avoid SPAM association
* DEV-15387 Write unit test for LLStringFn::strip_invalid_xml().
* Changed getpass.getuser() to os.getuid() as getuser() was returning the saved-UID of the process (root user, which kic
ks off parabuild as parabuild u
ser). We want os.getuid() as it correctly returns the parabuild user's uid. / Stupid mistake using os.getuid().. .fixed
by using the pwd module to return the unix username given the userid from os.getuid()
* QAR-623 More single ref attachment awesomeness testing
* Committed temporary fix for running dwell and query-cache on deneb.lindenlab.com, since it's in the DFW colo with the
current asset cluster.
* DEV-15783 Groups not shown in search wont appear in your profile while using webservice
* QAR-642 Even more single ref attachment awesomeness testing
From Branch_1-21-Server (which didn't go directly into release)
* addinng the phputf8 library found from http://phputf8.sourceforge.net/ and liscensed LGPL. For DEV-15202
* Checking in a fix for settle balance portion proc - the event query was moved.
* fix for DEV-15202 - replace non-utf8 with REPLACEMENT CHAR. See jira for more info.
* Checking return value from /proc/vault/charge, must get back a string.
* removed code used for the browser hud AB test.
* Changed TTL from stupid default of 1234 to 5
* DEV-15788 Fixing crashloganalyzer.py cleanup of unparseable crash reports.
* DEV-15737 offline scripted IMs not working inprocess_im_using_ws
Merge conflict resolutions/fixes include:
* Addition of indra/test/llstring_tut.cpp to indra/test/test.vcproj migrated to CMakeLists.txt
* Changes to BuildParams, scripts/automated_build_scripts/* reviewed w/ cg
* Changes to deploy scripts (scripts/farm, install_indra.py, farm_deploy) based on the 1.22 changes except for mkpersist
dir addition (retained from release)
* Changes to scripts/crash_report/crashloganalyzer.py retained from 1.22, per Mani
* scripts/generate_indra_xml.py, etc/services-station.dtd, indra/newsim/llagentinfo.cpp analyzed carefully by josh
* indra/llcommon/llstring.h required fix for client build ("" --> std::basic_string<T>()) in LLStringBase<T> initializer
* indra/llphysics/abstract/llphysicsshape.h #include syntax changed from <llmath/llvolume.h> to "llvolume.h"
Psst, don't tell anyone, but the dataserver-is-deprecated
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
|
