summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-09-10Fix a link error with an integration test on OS X.Bryan O'Sullivan
2009-09-08Merge from trunkBryan O'Sullivan
2009-09-08MergeBryan O'Sullivan
2009-09-08MergeBryan O'Sullivan
2009-09-08Fix some linking problems for tests.Bryan O'Sullivan
2009-09-08Floatercram the Report Abuse floater to fit in the side tray. EXT-756Kurt Stauffacher
2009-09-08MergeBryan O'Sullivan
2009-09-08Merge with SVN trunkBryan O'Sullivan
2009-09-08Fix deprecated conversion from string constant to ‘char*’ warningsMartin Reddy
that occur under gcc 4.3 for DEV-39457. This fixes the indra/test C++ unit tests under Linux.
2009-09-07merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3 * Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790 * New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788 * EXT-272 - Draggable Landmarks * EXT-715 - Block List Panel * EXT-782 - Implement advanced place information accordions
2009-09-07svn merge -r132705:132723 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3-stable propagate the changes to make stabel build back down.
2009-09-04DEV-39508 = Show Tools ("Build") menu by defaultSteven Bennetts
* Also eliminated some unused settings
2009-09-04svn merge -r132607:132665 ↵Christian Goetze
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.30 Propagating to trunk: QAR-1705 DEV-29573 QAR-1859 QAR-1804
2009-09-04Fixed the Linux build of viewer-2.0.0-3.Martin Reddy
- Updated linux_updater for new LLStringUtil::getTokens() signature - Ignore compiler warning for string constants not being referred to as const in fmod_error.h Fix for DEV-39457. Reviewed by moss.
2009-09-04Reorder some of the new LLStringUtil methods introduced in DEV-39441Martin Reddy
to avoid specialisation after instantiation build errors on Mac and Linux.
2009-09-04Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) intoMartin Reddy
Viewer 2.0 (viewer-2.0.0-3). This provides support for clickable Urls in text editors and textboxes, with right-click context menus, tooltips, and alternate link labels. This includes alert boxes, the login progress window, local chat and IM interfaces, etc. As well as context menus for avatars and groups in list widgets. Includes fixes for the following individual JIRAs: DEV-8763 VWR-10636: Hyperlinks in alert dialogs should be selectable (clickable)! DEV-38829 EXT-742: Remove LLLink class DEV-35459 VWR-14679: SLURLs and teleport Links not parsed properly DEV-19842 VWR-8773: Closing parenthesis ")" breaks urls DEV-21577 VWR-9405: In-world SLURLs containing "(" or ")" are not treated as a hyperlink in chat DEV-37652 SEC-435: Object Chat/IMs are untraceable (VWR-2388) Fix has left flaw DEV-10353: URLs in chat log terminated incorrectly when newline in chat DEV-2925: In chat history, use a teleport hyperlink as source name for object IMs DEV-36192: Need a way to copy Avatar names and Group names DEV-2926: Allow viewer hyperlinks to have different text than the actual url DEV-27253: Add easy way to copy URLs from viewer chat DEV-38274: Make About Second Life window use new Url hyperlinking features DEV-39076: No url support in Text Editors DEV-7476 VWR-2172: Add hyperlinks to chat console for easier access DEV-7475: Add hyperlinks to notecards! DEV-35375 EXT-128: HTTPS urls aren't loaded in the internal browser by click Master JIRA issues: DEV-32819, DEV-323820, DEV-7474 Testing performed against QAR-1789 svn merge -r 131623:131889 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3 svn merge -r 131978:132515 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
2009-09-04svn merge -r 129999:132607 ↵Don Kjer
svn+ssh://svn/svn/linden/branches/server/server-1.30 into trunk QAR-1863: Merge 525 changes from 1.27 -> 1.30 -> trunk 1.27 Changes: * QAR-1721: Vivox Recurring Billing (ViRB) * QAR-1743: 525 AO Classifieds * DEV-37701: Fix cleanup_indra nightly script so that it doesn't fail, and so that we know if it does * DEV-37926 - Fairmarket key roll 8/12/2009 * QAR-1744: 525 Landstore * QAR-1797: disable web services for find_people * QAR-1758: OpenID and Backup/recovery. * QAR-1794: ViRB proc fix - proc/recurring_billing/GetLocaleCountryByPackageId.php * Changing parameter name so the module signal could be used properly in the function below * QAR-1808 : Self-Reported First Name and Self-Reported Last Name have duplicate entries in the registration table * DEV-30204 : Moved the registration table from sequence to indra_aux. * removed dungeon from banned keyword list * DEV-30204 : Moved the registration table from sequence to indra_aux. Reviewed by kelly, cg, jarv * Merging new streambase dwell nightly to server-1.27 * Add update_parcel_dwell.py to serial_maintenance rule in the nightly.make Makefile, removing the dwell rule, since we don't want it running in parallel with other expensive nightly scripts. 1.30 Changes: * DEV-27476: version-manager only works in Firefox * DEV-27472: version-manager appears to load javascript from third party site. * mulib r92 that supports If-Modified-Since header and prevents arbitrary filesystem access through host:12107/manager/mochi/.. * Trivial conductor change that prevents a traceback when no regions are available to start. * Fixing "Out of Connections" error when running tests via SCUT * DEV-37554 - farm_deploy should get its ssh timeout from farm.ini * undo two lines of debugging changes that accidentally were checked in to farm * Adding MochiKit to MANIFEST for version-manager. * revised files for new parcel dwell process * Changing vault from an 'http' svn extern to a 'svn+ssh' svn extern. * DEV-38504 RPS map item queries are too verbose * added --skip-grid-mode-prompt to main in farm * DEV-38607: Region Presence Service includes disabled regions in estate responses, resulting in high slave query rate. * DEV-34781 - enable use_space_server_for_map_items and set map_item_request throttle settings in simulator.xml * DEV-38351 changes to ip_blacklist.xml file never get automatically picked up by the simulator * DEV-35443 Region border crossing issues. * DEV-35443 revert overzealous validity checking on neighbor messages. * DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix * QAR-1822 CPU Overrides update to indra.xml * DEV-15998 changing settings to re-enable teleport throttle, following DEV-37200 fix * DEV-34026 Update LLAgentInfo::forwardViewerStats() to make all viewer statistics * DEV-38906 Teleport throttle blocks prematurely when agent teleports back and forth between 2 regions * DEV-38861 Intra-region TP is blocked by inter-region TP throttl * DEV-38504 RPS map item queries are too verbose * initial import of deploy_to_dev_grid.sh
2009-09-04DEV-39441 - Eliminate boost:regexp from LLString::formatSteven Bennetts
Also removed a missing setting (merge bug)
2009-09-03DEV-39252 add 3 missing name= elements in the EN xui. This breaks localization.Ramzi Ramey
2009-09-03build issue - const invariance in llplugintest/llmediaplugintestBrian McGroarty
2009-09-03DEV-31909 Revise strings.xml used in LSL editor hovertipsRamzi Ramey
We are not going to use \n in the XML to refer to a newline in the official viewer. I changed these to a real CRLF.
2009-09-02DEV-39355 Remove ctrl-alt-V shortcut for View Admin OptionsBrian McGroarty
2009-09-02DEV-38453 (part 1)Ramzi Ramey
- need to refer to the correct button in the help text for new Pref > Graphics layout - need to rename nodes in Pref > General that have the OPPOSITE meaning as viewer 1.23; we intentionally want to disconnect these from their prior, opposite translation
2009-09-02Update XUI for Me Pick Info and Me Edit Edit Pick Info panels in sidetray to ↵Kurt Stauffacher
match updated style guide. EXT-805
2009-09-02merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 -> viewer-2.0.0-3 * Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543 EXT-656 EXT-801 * New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799 EXT-453
2009-09-02Made floater_media_browser.xml a single instance.Steven Bennetts
2009-09-01Fix up some more post-merge breakage.brad kittenbrink
2009-09-01Try double-quoting backslashesCG Linden
2009-09-01Use rev numbers instead of changeset IDs for now.Bryan O'Sullivan
2009-09-01DEV-39252 fix duplicate name= elements in the EN xui. This breaks ↵Ramzi Ramey
localization, please dont do it.
2009-09-01Patch in some other useful scripts from trunk.Bryan O'Sullivan
2009-09-01Merge with SVN viewer-2.0.0-3 branchBryan O'Sullivan
2009-09-01Trivial commit for hg import purposesBryan O'Sullivan
2009-09-01Sync up with a number of SVN changes that snuck in via weird mergesBryan O'Sullivan
2009-09-01Also quite the backslashes in the argument for the sign commandCG Linden
2009-09-01DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled testsNat Goodspeed
2009-08-31Quote any backslashes so they get preserved when invoking python.CG Linden
2009-09-01Fix syntax error introduced by your's truely into develop.pyChristian Goetze
2009-08-31Fix syntax error in viewer_manifest.pyCG Linden
2009-09-01EXT-791 - Add "Pause Agent" option to the Debug > Network menuSteven Bennetts
2009-09-01Add retry logic on certain exit codesChristian Goetze
2009-08-31Attempt to invoke the code signer differentlyCG Linden
2009-08-31Updated Me Profile and spec generated by 80/20. Removed Edit options for ↵Kurt Stauffacher
public profile display. Description of task in EXT-770
2009-08-31Removed some final dependencies to Awesomium and Flash ActiveX (mostly ↵Sam Kolb
porting over Callum's change: r132166) DEV-39138 build process on parabuild fails due to missing flash activex plugin
2009-08-31EXT-785 Remove old art resources from viewerErica Olsen
2009-08-31Fix up some post-merge breakage.Bryan O'Sullivan
2009-08-31Merge with trunkBryan O'Sullivan
2009-08-31Port over the new build scripts from para-test, tweek update_version_files ↵CG Linden
to use the repo revision number for now.
2009-08-31sheesh, finish(?) gutting the flash stuff out of DEV-31438Adam Moss
2009-08-31Updated Me Profile and Me Edit Profile xml files to match new spec generated ↵Kurt Stauffacher
by 80/20. Description of task in EXT-770
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-04 04:56:17 +0000