summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2009-09-11svn merge svn merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1614 https://svn.aws.productengine.com/secondlife/pe/stable-2@1618 -> viewer-2.0.0-3 * EXT-895
2009-09-10#ifdef'd out gmock and gtest for LL_WINDOWS. Does not appear to be needed ↵Steve Linden
and breaks the build.
2009-09-10Merge changesNat Goodspeed
2009-09-10Header file corrections to let us build without precompiled headers from ↵James Cook
llprimitive and llvfs. Allows better dependency analysis.
2009-09-10QAR-1619: move Linux SLPlugin executable to the viewer executable directoryNat Goodspeed
2009-09-10r128438 introduced a hilarious piece of mergefuckery about five weeks ago. ↵Adam Moss
eyeball this diff for a good laugh. I've verified that the evil twin is *identical*. reviewed by palmer.
2009-09-10revisit the fix for these:Adam Moss
DEV-30182 Tooltips lose their translucent background DEV-30508 Chat bar changes from white to dark upon text entry DEV-30830 Text color change after UI size change DEV-30751 Create object Name text field is grey out reviewed by Q.
2009-09-10DEV-38453 (more part 1)Ramzi Ramey
- change old <combo_item> nodes to the new <combo_box.item>
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, ↵Bradley Payne
Appearance Side Panel) - brought merge branch changes from avatar-pipeline/viewer-2.0.0-3_cwf-7_merge into viewer-2.0.0-3. svn merge -r132878:132947 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/viewer-2.0.0-3_cwf-7_merge
2009-09-10add'l EXT-883: add a few needed tooltips to buttons on Build floaterRamzi Ramey
2009-09-10Automated merge with http://hg.lindenlab.com/viewer/viewer-20/Bryan O'Sullivan
2009-09-10Fix a link error with an integration test on OS X.Bryan O'Sullivan
2009-09-10merge -r 1609-1612 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 Fixes: EXT-825 EXT-893 EXT-889 EXT-88
2009-09-10merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1602 https://svn.aws.productengine.com/secondlife/pe/stable-2@1608 -> viewer-2.0.0-3 * Bugs: EXT-848 EXT-865 * New Dev: EXT-790 EXT-822
2009-09-09Merge with SVN viewer-2.0.0-3 branchBryan O'Sullivan
2009-09-09DEV-39537: Moved the toHTTPDateString tests into llhttpdate_tut.cpp,Martin Reddy
as a more appropriate home. Also made use of the skip() method rather than use printf() - thanks to tofu for the suggestion.
2009-09-09Xcode 3.2 line-ending warningBrian McGroarty
2009-09-09Merged parabuild work and trunk with nat's latest linux linkage and LSL ↵brad kittenbrink
tests fixes.
2009-09-09DEV-39441: Removed include for boost/regex.hpp from llstring.h (andMartin Reddy
fixed up viewer files that relied on this being included for them). Also changed LLStringUtil::getSubstitution() to be a private method. Reviewed by steve.
2009-09-09Fix for DEV-39442: Increased the performance of LLDate::toHTTPDateStringMartin Reddy
by over 50 times. Looking at the usage, toHTTPDateStream is not called anywhere (except internally by toHTTPDateString), and toHTTPDateString is called only once outside of lldate.cpp, by LLStringUtil::formatDatetime. Also, the method is most commonly called with a single two-character token, such as "%Y" or "%A". I therefore removed toHTTPDateStream and optimized toHTTPDateString. Setting the locale was the most expensive operation, so I looked into caching that, both in terms of std::ostream and strftime. The timings for those implementations (averaged over 10 calls) is: toHTTPDateString timings: - with ostream (current) -> 0.314156 ms - with ostream and std::locale caching -> 0.033999 ms - with strftime and setlocale() caching -> 0.005985 ms I therefore went with the standard C library strftime solution. I also wrote a few unit tests to make sure that I didn't break any existing functionality, and tested this under Windows and Linux. Reviewed by steve.
2009-09-09fix media test app -- reviewed by jamesJiao Li
2009-09-09merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 ↵Steven Bennetts
-> viewer-2.0.0-3 Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
2009-09-09merge merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1581 https://svn.aws.productengine.com/secondlife/pe/stable-2@1585 -> viewer-2.0.0-3 * Bugs: EXT-838 EXT-815 EXT-872 * New Dev: IM Floater Docking
2009-09-09EXT-883 Match build tools to 2.0 visual styleErica Olsen
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-08QAR-1619: reconcile Linux-specific logic in LLAppViewer::launchUpdater() ↵Nat Goodspeed
with Windows and Mac
2009-09-08Merge from trunkBryan O'Sullivan
2009-09-08Remove llfasttimer.h from linden_common.h, not necessary and adds 15K lines ↵James Cook
of header code to every library .cpp file.
2009-09-08MergeBryan O'Sullivan
2009-09-08MergeBryan O'Sullivan
2009-09-08Fix some linking problems for tests.Bryan O'Sullivan
2009-09-08merged cg's automated build script changes into login-apibrad kittenbrink
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-08Merge Brad's r928694ee0b65 changesNat Goodspeed
2009-09-08QAR-1619: Finish replacing RunBuildTest.cmake with run_build_test.py.Nat Goodspeed
Because the details of RunBuildTest.cmake versus run_build_test.py had to be changed in so many different places, introduce LL_TEST_COMMAND CMake macro (in LLTestCommand.cmake) to encapsulate construction of the actual command line. Use LL_TEST_COMMAND in LL_ADD_PROJECT_UNIT_TESTS, LL_ADD_INTEGRATION_TEST, the big indra/test monolith and the various LslCompilerMacros. Fix run_build_test.py to pass through the test executable's own options (e.g. --touch, --output) without inspection. Defend it against the case when the platform-specific library path environment variable doesn't yet exist. Make it report errors only on nonzero test-program rc. Remove RunBuildTest.cmake.
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-04Fix for SLPlugin.exe packaging failure. Still needs some cleanup though.brad kittenbrink
qtwebkit4.dll etc aren't being staged to the sharedlibs dir like everything else.
2009-09-04Fix for link errors referencing operator!=(LLURI const &, LLURI const &) ↵brad kittenbrink
from integration tests.
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-04QAR-1619: Replace RunBuildTest.cmake with run_build_test.py for LSL tests.Nat Goodspeed
RunBuildTest.cmake can't handle pathnames containing spaces. run_build_test.py accepts an arbitrary number of individually-quoted command-line arguments, passing each through to Python's subprocess.call().
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 11:51:05 +0000