will be available in our next public release. The server part of the
fix missed 1.30, but should (hopefully) get into 1.32.
Original fix was reviewed by soft and kelly.
Includes:
* DEV-31909 VWR-13251: Revise lscript_library.cpp to allow localization of LSL editor hovertips
* DEV-21938 llSHA1String does not appear where expected in the dropdown "Insert" menu in the LSL editor
* Some cleanup to llerror so that it doesn't depend on llfixedbuffer
* A few misc. server specific changes not related to the texture-pipeline changes (llapp, lloptioninterface)
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.
reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
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)
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.
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.
this is a combined mergeback of the following branches as per QAR-841:
maint-server/maint-server-1 (absorbed by maint-server-2)
maint-server/maint-server-2
maint-server/maint-server-3
havok4/havok4-8
havok4/havok4-9
yes dataserver-is-deprecated
Merging various fixes from 1.24 Server.
From 1.23:
* DEV-18957: SCUT: Enable test.py to run tests agains a grid database
From 1.24, the UPCOMING production branch:
* DEV-18934 VWR-8519: 1.21 nightly: World > Region/Estate > Debug > Get Top Scripts crashes viewer
* Sanity checking build settings before packaging binaries
* DEV-19810 Updated libmono on linux with support for signal chaining
* Remove gdb references to gPumpFile and gPumpLine in crash_reporter.py
* DEV-19397: Changed the signature for remote_data to for Mono scripts
* DEV-19396: Steal signal handlers back from Mono on error.
* DEV-19396: attach mono thread if necessary during writeState
* DEV-19396: Allow mono to handle managed SEGV signals during emergency save
* DEV-19396: Disable GC while writing the simstate during a crash
* DEV-19550: Make viewer crash reporter handle different binary debug file names
* Defensively protect against responders not being in list and give a warning rather than crash.
* Fix simulator crash in shutdown error handling that also causes error stacks to go unreported
* DEV-19752 QAR-834 Remove Community Standards window from startup. Set the "critical message" name on agni to NULL.
* Minor traceback fixes in backbone for multiagentchat
* Removed some mono debug spam
* DEV-19239: Group members receives an error upon opening group chat if join group chat was disabled then reenabled.
* DEV-19809 Harden llGetNextEmail to bad params
* DEV-17967 fixed null string and keys passing to lib funcs
* Several small fixes for farm deploy tools and automated build system
* Sync indra/agent/auth.py with interop-5 branch, and update status codes
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
Backport server patches from 1.22 Server production branch to the trunk.
* DEV-16189 Search: Private Estate on Teen Grid Visibility issue.
** svn merge -r88933:89027 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server
* QAR-651 / DEV-14894: Convert relevant webservices to use the on/in syntax to prevent them from needlessly hitting mysql.agni
** svn merge -r89027:89030 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server
* Adding back the type_mask checking which was causing extra terms to be blacklisted.
** svn merge -r89030:89032 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server
* Under GCC, argument names must match between declaration and definition
* Incorrect rename
* Cherry pick fix for DEV-16131, already pushed live to agni
** svn merge -c 89174 svn+ssh://svn.lindenlab.com/svn/linden/release
* QAR-664 Resolve start-location Errors on Login
** svn merge -r 88842:89176 svn+ssh://svn.lindenlab.com/svn/linden/branches/user_start_location_missing_fix
* QAR-668 / SEC-53: Script that crashes regions (Round 2)
** svn merge -r 89206:89210 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-2-Server_DEV-12357
* QAR-579 / SEC-77 - prevent sim crash caused by libsl proxy packet injection
** svn merge -r 87143:87226 svn+ssh://svn.lindenlab.com/svn/linden/branches/sec-77-crash
* DEV-16297 Error Message Can't rez object because you are not allowed on the parcel on some group owned parcels ; Group permissions & rezzing on group land changed in 1.22.2
* DEV-16189 - New query to get a region's parent estate, so we can hide main grid regions from teen users (and vice versa) in All search.
* svn merge -r 89494:89593 svn+ssh://svn.lindenlab.com/svn/linden/branches/safe-locations/kill-table-scan --> Branch_1-22-2-Server
* simulator.xml file that has improved-im and send-mail enabled.
* DEV-16477 and DEV-16380 - fixes to prevent ever expanding db table and writing LLMETRICS to syslog for streambase.
* Fixed a teeny bug that caused sorting to be messed and broke DEV-16745.
* Adding geolocation IsPass proc to Branch-1-22-2. It is needed to login.cgi work that can only be done against agni at the moment
* QAR-693 svn merge -r89984:89986 svn+ssh://svn/svn/linden/branches/security/rez-attach_sec-95 into Branch_1-22-Server.
* QAR-619 svn merge -r87886:87945 svn+ssh://svn.lindenlab.com/svn/linden/branches/security/sim-crash-sec-83 into Branch_1-22-Server
* Permanently enabling procs as part of DEV-14770 - Enable script-data-requests
* Changed TTL to 300 seconds (5 mins) to match lldatabaseconnector's time out value
* Permanently enabled parcel-info. Deployed to grid: June 18, 2008. Tracking Jira DEV-14135
* Updated named query TTL to 3600. Used to be 0
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
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
Port fixes for:
* DEV-10609 Checkboxes in About Land untick when selected
* Extend the sim node regex to support sim1-telstra.durga.lindenlab.com for colo testing.
* Provide "version_valid" for each version when querying a channel
* Update to latest eventlet r87, to handle multi-character terminators split across read buffers
* DEV-10487 Log viewer stats sim and php fix
* QAR-288: Pull in crash fixes from LSL bytecode parsing
* DEV-10498 The agentN-ds host name was constructed incorrectly and caused services_base_url to be incorrect
* Fixed a potential crash bug caused by LSL library functions returning null pointers instead of empty strings.
** This should be the last merge from branches/maintenance. All future merges will be from new maintenance-# branches off release **
ACTUAL MERGE: svn merge -r70609:70621 svn+ssh://svn/svn/linden/branches/maintenance-0-qa-r70556
RELATED MERGE: svn merge -r69921:70316 svn+ssh://svn/svn/linden/branches/maintenance-0-qa
Merge patches made in the 1-18-3 RC iterations into the trunk.
NOTE: Includes the reversion of SL-51274 (originally maintenance r67559, changed lltracker.cpp)
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
Loren Shih