| Age | Commit message (Collapse) | Author |
|---|
|
viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
|
|
mean "the development version between release versions 1.27 and 1.30".
|
|
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/server/server-1.26
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.
|
|
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.lindenlab.com/svn/linden/branches/server/server-1.25
Merge server 1.25 back to trunk
Conflicts:
C indra/llcommon/llversionserver.h : svn reverted
C indra/tools/bill/MoneyMachine.pm : one conflict, only difference
was a blank line.
C indra/newsim/lllslmanager.cpp : kept merge-right, in consultation
C indra/newsim/lllslmanager.h : with babbage
C indra/newsim/llagentinfo.cpp : (runNested, not runSpecial)
C indra/test/test_entity_query.py : Kept merge-right
C indra/test/test_agent_linden_dollar.py : Kept merge-right
--> Kartic fixed these testes in server-1.25
C indra/test/template/httpd.tmpl : Kept merge-right
(the IfModule version)
|
|
version in trunk to 1.27.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
NOTE : also ran
scripts/update_version_files.py --verbose --server --server_channel="Second Life Server"
to update server version information before doing a compile test.
Committed with the results of this version file update.
Conflicts resolved by prospero:
scripts/maintenance/update-groups.py : kept the trunk version (was
merged from Rad Chillies)
scripts/make_deploy_group.py : merge by hand (I'm the one to do this,
anyway)
indra/llcommon/llversionserver.h : kept trunk version
indra/newsim/llgettaskstats.cpp : kept trunk version. (svn revert)This
was imported late into 1.25, after the
branch merged into trunk, and no
changes were made in the 1.25 branch
after the import.
indra/newsim/llparcelstats.cpp : same as llgettaskstats.cpp
indra/newsim/llscriptcounter.h : same as llgettaskstats.cpp
indra/newsim/llagentinfo.cpp : like llgettaskstats.cpp, but more
complicated as some of soft's God-logging
that came from 1.24->1.25 was in here.
Fortunately, the conflict was trivial
(missing include)
idnra/newsim/simulator.cpp : one small conflict. Kept the 1.25 version
of SKU/product stuff, as it was likely part
of the homestead stuff that was recently
put into 1.25. However, there was some
code after that in the merge conflict that
had been removed from trunk that I also
removed in the resolution. This code is 27
lines starting at the comment "Asset cache
service", as can be found in the
server-1.25 branch.
indra/newsim/tests/fakeobjects.h : kept the trunk version. No changes
to 1.25 after parcel stats merge,
except for a compile error fixed by
andrew about which he warned there
would be merge issues...
indra/newsim/tests/llgettaskstats_test.cpp : same as llgettaskstats.cpp
indra/newsim/tests/lllslmanager_tests.cpp : same as llgettaskstats.cpp
indra/newsim/tests/llparcelstats_test.cpp : same as llgettaskstats.cpp
indra/newsim/llgettaskstats.h : same as llgettaskstats.cpp
indra/newsim/llparcelstats.h : same as llgettaskstats.cpp
indra/newsim/llscriptdata.cpp : same as llgettaskstats.cpp, except for a
fix that josh made both to trunk and
1.25
indra/newsim/llscriptdata.h : same as llscriptdata.cpp
indra/newsim/llscriptcounter.cpp : same as llgettaskstats.cpp
indra/newsim/CMakeLists.txt : similar to llgettaskstats.cpp, except that
there was an additional change to trunk
(so doing "svn revert" to keep trunk is
still the right thing)
indra/backbone/multiagentchat.py : where there were conflicts, kept the
server-1.25 version. Phoenix had put
in some fixes for dealing with
omissions of the accept header in the
1.25 branch.
indra/backbone/group_linden_dollar.py : similar to multiagentchat.py.
All but one or two conflicts
were utterly trivial (missing
blank line)
indra/backbone/agent_linden_dollar.py : all merge conflicts were utterly
trivial (missing blank line);
I'm surprised svn got all fussy
about them.
indra/lib/python : conflict was because the externals had been futzed
with in 1.25 during debugging of backbone memory
bloat. Kept the externals as in trunk.
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
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.
|
|
are changes in that branch that haven't been merged down into release
yet. It makes more sense for things branched from release to be called
1.25 rather than 1.24 now....
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Merging various security fixes from Branch_1-24-Server.
Related to RequestXfer exploit:
* DEV-21706 (SEC-188): llParticleSystem can be used to obtain asset id.
* DEV-21767: Migrate RequestXfer to TCP-only
* DEV-21765: Fix RequestXfer traversal exploit
* DEV-21775: LLXferManager::processFileRequest() still has file vulnerabilities
Various fixes:
* fix for VFS memory corruption in llvfs.
* Bump server version to 1.24.9.
Landstore fixes:
* Passing locale to fulfill-order-item from region reservation fulfillment.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/deploy-refactor-2
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Merging fixes from 1.24 Server.
From vcr-maint-2:
* QAR-856: viewer crash log analyzer updates.
From direct-slurl-1:
* login.cgi: simplification of the way start-locations are chosen and the new-user browser tutorial is shown.
* No longer fake ever-logged-in flag
* support for dataservice query string encryption
from maint-server-4:
* DEV-19961: llInstantMessages of length N fail.
from landstore-v2-01-merge:
* DEV-12330: Allow Neighbors & Tweaks.
* DEV-14126: Re-order items on Region Detail page.
* DEV-14064: Add "Delete" order buttons in the View Cart area.
* DEV-15026: Indicate in the Event Log whether purchase is a Openspace or regular region.
* DEV-15242: disable checkout button after first click.
* DEV-15285: Region Names in cart or fulfilled should expire after 30 min or when delivered.
* DEV-14018: No currency listed for land prices
* DEV-1688: Tool: Ability to view and clear Allowed Neighbors from a region.
* DEV-17199: Fatal error when adding your login name to your allowed neighbors list.
* DEV-17251: Deleting an unavailable item from the shopping cart causes a fatal error.
* DEV-17291: Fatal error occurs when performing various activities.
* DEV-17177: Typo on Land store 2.01 checkout page.
From 1.24:
* DEV-19865 (SVC-2927): Abandoning land changes land name and description even when done by an Estate Manager.
* DEV-19916 (SVC-2938): bug fix for llGetNextEmail() failure.
* DEV-19936 (SVC-2962): adding a value to a list also modifies the list in place.
* SVC-2750, SVC-2958, SVC-2973: Changed LSL scheduler logic to yield if finished and no state change is pending.
* indra/lib/python/indra/agent/auth.py no longer assumes there is a critical message, and checks credential as specified by OGP rev3.
* DEV-20051: Added defensive checks on script rez path.
* Improvements to scripts/make_deploy_group.py.
* DEV-18897: llScriptReset wasn't resetting events for LSL scripts.
* DEV-20127: Fix for stl misuse in newsim/llsimparcel.cpp.
* DEV-18897: Mono Beta - LSL attach() event survives reset.
* DEV-20212 (VWR-9026): String fix - Attempting to teleport to "Help Island" produces a dialog referencing "Orientation Island"
* DEV-20164: llListen caching indefinitely across states.
* DEV-19950: timer() event triggers before on_rez(), & state_entry()
* DEV-19712 (SVC-2908): C# error messages with Mono Compiled scripts
* Fixes for chat service unit tests.
* DEV-19106: (SVC-1571): Rezzing a coalesced objects with 1024 scripted prims fails.
|
|
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer-merge-1
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release
Backport fixes from UPCOMING production branch:
* Fixed gdb/simulator statistics bucket index: "bucket[1]" to "bucket[2]"
* Updated eventlet and mulib external revisions
* Various deploy script tweaks
* DEV-17796 Sim performance decreases a lot with rezzing physical objects
* DEV-18900 Turn off the LL_DEBUG_PUMPS code
* DEV-18896 SVC-2738: Mono Beta: Newer LSL functions will not compile under Mono
* DEV-18825 make install_indra.py produce the /local/www/login.GRID.lindenlab.com tree/symlinks
* DEV-18826 make install_indra.py produce the /local/www/xmlrpc.*.com tree/symlinks
* DEV-18188 View:Property Lines and View:Land Owners shows everything as group owned even if it's not under 1.23.2.92647
* DEV-18723 develop.py -t Release build server should build everything needed to succesfully farm stage a server
* DEV-18316 Simulator crashing on exit due to bad use of global pointer caching
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release
Backport fixes from production branch
* DEV-8282 integrated alt check with durls white list code
* Fix for memory stomping due to deleting vector as scalars
* DEV-16904 Email message shows incorrect owner when inventory item is sent to offline resident from scripted object inworld
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server --> release
Backport fixes and other cruft from the production branch:
* DEV-16158 make_deploy_group.py queries simulator_standby table not region conductor
* DEV-17891 SEC-118: Classifieds can be created with any amount paid for L$50
* QAR-745 Test rez object security break - SEC-104 (and possibly SEC-115)
* DEV-18161 allow_negative_balance parameter for sink operation so fraud team can dock the accounts of people who bought bad L$
* DEV-18217 Crash rate >10x higher in 1.23.2 than 1.22.4
* DEV-15570 Enable Improved IM web service
* add auth.py from interop-5 (for interop login testing on preview grid)
did-you-know-that-dataserver-is-deprecated?
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server
Backport fixes from the 1.23 Server branch
* DEV-17223 remove the words slot and bets from dataserver.xml
* DEV-17351 Unable to set estate manager
* DEV-17138 users with god mode capabilities not able to join groups
* DEV-17785 SVC-2633: Floating Text which was set before Server Update 1.23 does not do linebreaks anymore but one line instead
* DEV-17863 Memory Leak in 1.23 (related to returning objects?)
* DEV-17804 CSR tool showing old data on Summary page
* DEV-17811 Ban list showing (???) (???) for names
dataserver-is-deprecated
|
|
|
|
--> 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/Branch_1-21-Server --> release
* QAR-522 / DEV-14318: Crash in LLSD:operator[] -- web connected? Traceback includes LLCurl::Responder::completed
* landstore-6 dataservices
* DEV-14141 - Enable avatar-properties. done 2008-05-01 14:00
* new query, for use by sl.com /lib/models/login.php
* disabling evil slave crashing query.
Also the following which has NOT been pushed into production yet
* QAR-531 DEV-14457 SEC-67 Hacked client can bypass estate access lists
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server --> release
Backport fixes made in the production branch to the trunk now that it is live on the grid:
* DEV-14443 Launcher not producing colo prefix when looking up sim class
* DEV-10840 "/etc/init.d/backbone stop" returns before all child backbones exited; "backbone restart" results in defunct children
* DEV-12558: Able to make anyone's object shout error messages
* QAR-483 user start location migration prelude
* QAR-490 havok4-6
* Revert havok4-5/4-6 code changes causing parcel access check issues
* Revert QAR-277 sqlite-backbone
* DEV-12357 SEC-53: Script that crashes regions
* QAR-486 New proc and query for Web Classifieds Fix
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-21-Server
Includes pullout of migrate-start-location-2, webservice changes made to 1.20, DEV-7229, and other web-ds changes. Reviewed by Josh.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-20-0-Server
|
|
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
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
Handful of changes from the production branch, mostly in the dataservices. Login.cgi changes to mitigate DB load and support A/B testing of the browser-hud work. Revert crash reporter behavior to 1.19.1 to avoid DB grief.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
Includes:
DEV-12492 "new" regAPI fails on php-framework-2
DEV-11540 Show browser HUD for A/B test users coming from SL.com.
DEV-11730 LLSD parser changes
PHP logs to syslog
DEV-12146 php llsd_UUID does not pass the IsUUID() validation function
DEV-12356 oldstyle FetchInventoryDescendents should be TEMPLATE not LLSD
steve's fix to setting the proxy option in curl
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
Sprinkle "--location" pixie dust into farm curl calls
QAR-387 - pull in fix for missing abuse report snapshots (asset-id --> asset_id) / DEV-11758
comment --> template comment tweak by yoz for postcards
QAR-351 - Event queuing modifications
DEV-11639 - fix for llsdhttp.py to work with newer eventlet API
Rotating log_text_message is now part of the cron jobs
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
Reg-api merge is the bulk of the diff, it's actually not so bad. Change summary:
* Fixed a bogus HTTP/curl warning and cleaned up one line of code for clarity
* extra '.' in FQDN names/extra . in the non-FQDN case, which is a syntax error
* DEV-11542 Joining two parcels destroys search relevance of a store.
* Fixed bug preventing users who turn off email notification from getting offline messages at login
* Updated version numbers
* New reg-api (w00t!)
* DEV-11427 / DEV-11399 - LSL slowdown from strncpy buffer-clearing overhead
* DEV-11359 Hide music URL should be on by default
* Update to r89 of eventlet
* QAR-347 "SEC-28 - It is possible to rez any object, whether you own it or not."
* QAR-336 Additional logging to track teleport failures
* DEV-11397 - use the slave db for read queries for crons
* Fix to turn off PEAR debug logging
* Copied code from eventlet.coros to make an Updater that won't die so easily. (multiagent-chat)
* Various chicanery with dir-find query
* Emergency fix for bad FORCE INDEX on user table when actually searching on the user_last_name table
* DEV-11124 : Modify backbone service proxy so that we know which web-ds host a dataservice is actually called
* Fixes for DEV-5883 : Test improved-instant-message
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
Merge patches from 1.19.1 Server branch:
* QAR-293 Fix for hardcoded TTLs in web dataservices
* DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size
* Bounce apache2 processes before starting backbone/dataserver/simulator
* Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61.
* Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak
* Fixed minor, non user facing bug in multiagentchat
* set-classified-stats: Rewrote to use new MDB2 query reformatting syntax
* Fixed possible bad conversion of vivox data
* DEV-550, caching changes to DirClassifieds Query
* QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend
* More mem leak fixes for multiagent-chat
* QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP
* DEV-10151: Sometimes group IMs appear to be person to person IMs
* QAR-321 Changes to crash_reporter
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY). Web service version of this, must use two named queries because we need to change the query based on input string length.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
* DEV-10645 Log old-style searches to compare frequency/terms versus new search (LLLog)
* MapNameRequest was accidentally enabled - now disabled
* Add support for slave.mysql.GRID to generate-indra-xml.pl
* QAR-293 Fix for hardcoded TTLs in web dataservices
* Updated version numbers
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Server --> release
* Fix for login script "active gestures" query causing massive inv db load
* DEV-9755 - calling llEscapeURL with an empty string crashes the simulator
* DEV-7007 - Block users who are limited to a subestate from connecting to any other subestate on login.
* Revert maintenance-4/indra/dataserver/lldatainventory.cpp r74862 due to bad query performance
* Make llEscape() behavior match previous behavior (and curl)
* DEV-9871 - Record of land sale transaction in 1.19.0 regions failing to update in World/CSR
NOTE: There are more changes after 79136 that need to get merged, but they haven't been through QA
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server --> release
Pick up patches for:
* DEV-7727 Simcrash caused by bots sitting on trees
* DEV-8091 No-Copy can be circumvented by coalescing object with a Linden plant
* QAR-173 Add content negotiation to login.cgi and transform.cgi so people can log in with llsd instead of xmlrpc
|
|
svn+ssh://svn/svn/linden/branches/Branch_1-18-6-Server -> release
|
|
svn merge -c 74225 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74273 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74366 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74424 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -c 74444 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
svn merge -r 74473:74631 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Server
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Server --> release
Missed merge range in release r74199. Josh is an idiot.
|
|
svn+ssh://svn/svn/linden/branches/viewer-auth-server-2
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
Backport of fixes from production branch. Merge verified with QAR-41
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-3-Server --> release
Merge fixes applied directly to 1.18.3 for server deploy, through the sim rollout:
* Listen on the right port for the auditor, don't rely on catch-all
* Fix XMLRPC test object channel
* Various VAT fixes
* Make update_version_files more resilient
* Add class 502/510 for new datacenter
* Teleport metrics fixes
* DB schema update
|
|
into release. had to blow away the libraries directory to clear up svn evil.
|
|
* Tweak simulator_version script to slam all regions to the new version we're deploying
|
|
Tess and Leyla.
Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
|
