Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Nat Goodspeed 5669597e18 QAR-1619: reconcile Linux-specific logic in LLAppViewer::launchUpdater() with Windows and Mac 2009-09-08 16:21:03 -07:00
Bryan O'Sullivan cab31b572d Merge from trunk 2009-09-08 15:35:19 -07:00
James Cook a67d2dd1a4 Remove llfasttimer.h from linden_common.h, not necessary and adds 15K lines of header code to every library .cpp file. 2009-09-08 22:09:11 +00:00
Bryan O'Sullivan 1018b36b87 Merge 2009-09-08 14:49:49 -07:00
Bryan O'Sullivan 76001ce3f0 Merge 2009-09-08 14:28:31 -07:00
Bryan O'Sullivan 91aa2f37f4 Fix some linking problems for tests. 2009-09-08 14:24:22 -07:00
brad kittenbrink 11d10bd53a merged cg's automated build script changes into login-api 2009-09-08 16:44:38 -04:00
Kurt Stauffacher 2ed83382a1 Floatercram the Report Abuse floater to fit in the side tray. EXT-756 2009-09-08 20:39:42 +00:00
Bryan O'Sullivan 7ad3af45a6 Merge 2009-09-08 13:27:05 -07:00
Bryan O'Sullivan 5b428d3a63 Merge with SVN trunk 2009-09-08 12:25:35 -07:00
Nat Goodspeed 285a4173aa Merge Brad's r928694ee0b65 changes 2009-09-08 12:07:14 -04:00
Nat Goodspeed b9546a33e9 QAR-1619: Finish replacing RunBuildTest.cmake with run_build_test.py.
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-08 12:03:32 -04:00
Martin Reddy b86d7cbc12 Fix deprecated conversion from string constant to ‘char*’ warnings
that occur under gcc 4.3 for DEV-39457. This fixes the indra/test
C++ unit tests under Linux.
2009-09-08 09:07:57 +00:00
Steven Bennetts 79653dfed4 merge 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-07 22:55:07 +00:00
Christian Goetze a9b2296b2b svn merge -r132705:132723 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-07 07:56:10 +00:00
Steven Bennetts ad169d3f54 DEV-39508 = Show Tools ("Build") menu by default
* Also eliminated some unused settings
2009-09-04 23:55:15 +00:00
brad kittenbrink 2ecd268980 Fix for SLPlugin.exe packaging failure. Still needs some cleanup though.
qtwebkit4.dll etc aren't being staged to the sharedlibs dir like everything else.
2009-09-04 19:53:51 -04:00
brad kittenbrink 369f5ba524 Fix for link errors referencing operator!=(LLURI const &, LLURI const &) from integration tests. 2009-09-04 14:37:55 -04:00
Christian Goetze 74e584add6 svn merge -r132607:132665 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-04 18:16:21 +00:00
Martin Reddy f929ec2d64 Fixed the Linux build of viewer-2.0.0-3.
- 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-04 17:05:31 +00:00
Nat Goodspeed afe09c1385 QAR-1619: Replace RunBuildTest.cmake with run_build_test.py for LSL tests.
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-04 11:30:19 -04:00
Martin Reddy 92cccb9790 Reorder some of the new LLStringUtil methods introduced in DEV-39441
to avoid specialisation after instantiation build errors on Mac and
Linux.
2009-09-04 14:02:46 +00:00
Martin Reddy 330840af7c Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
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-04 12:11:27 +00:00
Don Kjer 76d05a7e50 svn merge -r 129999:132607 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-04 02:27:28 +00:00
Steven Bennetts 2273376dff DEV-39441 - Eliminate boost:regexp from LLString::format
Also removed a missing setting (merge bug)
2009-09-04 00:16:51 +00:00
Ramzi Ramey f03db936f8 DEV-39252 add 3 missing name= elements in the EN xui. This breaks localization. 2009-09-03 23:53:47 +00:00
brad kittenbrink e59ac9197c fix for build_win32_appConfig.py failing to find Microsoft.VC80.CRT.manifest on clean builds.
the "Copying staged dlls" pre-build step for newview got moved to be a pre-build step for
create_app_config_file and create_app_config_file now depends on stage_third_party_libs.

reviewed by Nat.
2009-09-03 18:26:51 -04:00
Nat Goodspeed 5260a53e88 Merge changes 2009-09-03 17:04:53 -04:00
Nat Goodspeed a1c69da326 QAR-1619: Fix Windows link errors when building INTEGRATION_TEST_lllazy.
The problem arose because we were setting LL_COMMON_BUILD in
llcommon/CMakeLists.txt, not only for the library build itself but also for
its LL_ADD_INTEGRATION_TEST tests. This told all the headers compiled into the
INTEGRATION_TEST_lllazy executable that the executable was providing all the
llcommon symbols, rather than importing them.
The solution is to switch to the llcommon_EXPORTS symbol automagically defined
by CMake when building the llcommon shared library itself.
2009-09-03 16:50:44 -04:00
Brian McGroarty ae6c3d7d6c build issue - const invariance in llplugintest/llmediaplugintest 2009-09-03 02:57:14 +00:00
Ramzi Ramey 295dfd4351 DEV-31909 Revise strings.xml used in LSL editor hovertips
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-03 00:20:39 +00:00
Brian McGroarty 22bbba4dd4 DEV-39355 Remove ctrl-alt-V shortcut for View Admin Options 2009-09-02 23:06:00 +00:00
Nat Goodspeed afea10ebc9 On Mac, move SLPlugin executable to the same directory as the viewer executable.
Change LLDir_Mac::getLLPluginLauncher() to look in the viewer's executable dir
instead of in the plugins dir. Change viewer_manifest.py's
DarwinManifest.construct() to put SLPlugin in the new location.
SLPlugin is being linked with our new libllcommon.dylib, which self-identifies
as being findable via @executable_path/../Resources/libllcommon.dylib. This
doesn't work from the Resources/llplugin subdir -- the above relative path
ends up looking in the nonexistent Resources/Resources subdirectory. Putting
SLPlugin in the Contents/MacOS directory with the viewer executable solves the
problem.
2009-09-02 17:38:46 -04:00
Ramzi Ramey c0681e561a DEV-38453 (part 1)
- 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-02 21:11:44 +00:00
Kurt Stauffacher 1f881a743a Update XUI for Me Pick Info and Me Edit Edit Pick Info panels in sidetray to match updated style guide. EXT-805 2009-09-02 18:09:50 +00:00
Steven Bennetts 5612f13dc8 merge 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-02 02:59:07 +00:00
Steven Bennetts 1a5cb4fbfb Made floater_media_browser.xml a single instance. 2009-09-02 02:01:55 +00:00
brad kittenbrink 0f0853a6fe Fix up some more post-merge breakage. 2009-09-01 18:16:04 -04:00
CG Linden 40743eaf99 Try double-quoting backslashes 2009-09-01 13:36:08 -07:00
Nat Goodspeed 8d8e309bfe Merge whitespace-only changes 2009-09-01 16:11:27 -04:00
Nat Goodspeed 5da7db5571 RunBuildTest.cmake definitely needs the separate_arguments() command, else
when you pass in a command string with command-line arguments,
RunBuildTest.cmake attempts to search for a program whose filename is the
entire command line. Uncommented separate_arguments().
Added SHARED_LIB_STAGING_DIR to LL_ADD_INTEGRATION_TEST LD_LIBRARY_PATH.
2009-09-01 16:01:55 -04:00
Bryan O'Sullivan dd628f29af Use rev numbers instead of changeset IDs for now. 2009-09-01 11:54:34 -07:00
Ramzi Ramey 02a1b5ea08 DEV-39252 fix duplicate name= elements in the EN xui. This breaks localization, please dont do it. 2009-09-01 18:40:07 +00:00
Bryan O'Sullivan 5f3a7fa6f3 Patch in some other useful scripts from trunk. 2009-09-01 11:18:33 -07:00
Bryan O'Sullivan d508beb044 Add hg metadata files 2009-09-01 11:14:33 -07:00
Bryan O'Sullivan 52708727f4 Merge with SVN viewer-2.0.0-3 branch 2009-09-01 11:08:44 -07:00
Bryan O'Sullivan 3e5819d862 Trivial commit for hg import purposes 2009-09-01 18:01:40 +00:00
Bryan O'Sullivan 359fb94741 Sync up with a number of SVN changes that snuck in via weird merges 2009-09-01 11:04:15 -07:00
brad kittenbrink 5e4edfb83f Fixups for eol-style copy pasta... 2009-09-01 13:12:17 -04:00
brad kittenbrink 04d2c459b9 Fixup for closing paren dropped in the merge. 2009-09-01 13:11:10 -04:00