Commit Graph

39337 Commits (405f5c879c44f32635dcb94de2c7dfb9e4a8673a)

Author SHA1 Message Date
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
brad kittenbrink bae94e4340 Merged login-api with viewer-2.0.0-3 up through r132290. 2009-09-01 12:21:51 -04:00
brad kittenbrink 3dc23bc183 Merged in nat's ucontext fix on osx 10.5. 2009-09-01 12:05:35 -04:00
CG Linden a6ff5974c3 Also quite the backslashes in the argument for the sign command 2009-09-01 09:00:02 -07:00
Nat Goodspeed 3069355a6f DEV-34522: [COMMENTS ONLY] clean up comments about (formerly) disabled tests 2009-09-01 14:41:04 +00:00
CG Linden 1a6be4eb17 Quote any backslashes so they get preserved when invoking python. 2009-08-31 20:09:56 -07:00
Christian Goetze cbad737f59 Fix syntax error introduced by your's truely into develop.py 2009-09-01 01:46:05 +00:00
CG Linden 7eafa3209c Fix syntax error in viewer_manifest.py 2009-08-31 18:34:03 -07:00
Steven Bennetts 778b893212 EXT-791 - Add "Pause Agent" option to the Debug > Network menu 2009-09-01 01:03:51 +00:00
Christian Goetze 01d957c3e4 Add retry logic on certain exit codes 2009-09-01 00:55:00 +00:00
CG Linden 2149be5df2 Attempt to invoke the code signer differently 2009-08-31 17:16:02 -07:00
brad kittenbrink 81d3f7ec6b Post-merge cleanups (ported llstartup.cpp changes to where the surrounding code has been moved to in LLLoginInstance and LLAppViewer) 2009-08-31 20:00:09 -04:00
Kurt Stauffacher e20ac4718e Updated Me Profile and spec generated by 80/20. Removed Edit options for public profile display. Description of task in EXT-770 2009-08-31 23:28:56 +00:00
Sam Kolb 410e2228fd Removed some final dependencies to Awesomium and Flash ActiveX (mostly porting over Callum's change: r132166)
DEV-39138 build process on parabuild fails due to missing flash activex plugin
2009-08-31 23:08:06 +00:00
brad kittenbrink 3df557435f Post-merge cleanups (adding LL_COMMON_API declarations) 2009-08-31 18:43:12 -04:00
brad kittenbrink abf683fe6f Post-merge cleanups (stage_third_party_libs is the new copy_win_libs) 2009-08-31 18:42:28 -04:00
Erica Olsen 5e7034a53b EXT-785 Remove old art resources from viewer 2009-08-31 22:39:14 +00:00
Bryan O'Sullivan f4f02f0f34 Fix up some post-merge breakage. 2009-08-31 15:09:13 -07:00
Bryan O'Sullivan 30ff6cabd6 Merge with trunk 2009-08-31 13:47:47 -07:00
CG Linden 89de8e5b55 Port over the new build scripts from para-test, tweek update_version_files to use the repo revision number for now. 2009-08-31 13:26:35 -07:00
Adam Moss 3ac3a4b206 sheesh, finish(?) gutting the flash stuff out of DEV-31438 2009-08-31 18:46:54 +00:00
Kurt Stauffacher e77338c956 Updated Me Profile and Me Edit Profile xml files to match new spec generated by 80/20. Description of task in EXT-770 2009-08-31 17:46:13 +00:00
Adam Moss 158946668a svn merge -r130875:131962 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05_newllqtwebkit
DEV-31438 Rename LLMozLib (Qt/WebKit) to something else - LLQtWebKit
2009-08-31 17:16:21 +00:00
Erica Olsen 6dbef5f2a4 Standardized layouts, changed commitment model labels to ok/cancel, modernized advanced floaters. 2009-08-31 05:21:50 +00:00
Nat Goodspeed 491f9fc986 Add magic -D switch to work around OS X 10.5 bug in ucontext.h 2009-08-29 10:35:41 -04:00
Steven Bennetts a1ed9ccf73 Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2.0.0-3
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)
2009-08-29 06:23:41 +00:00
Steven Bennetts c4384d64a1 EXT-729 - moved XML from menu_minimap.xml to menu_mini_map.xml and deleted menu_minimap.xml (translations all have menu_mini_map.xml) 2009-08-29 01:47:33 +00:00
Steven Bennetts 10459c79e7 EXT-614 Object inventory does not update to show inventory created or placed in the object.
Reviewed by: Seraph
2009-08-29 01:08:39 +00:00
Monroe Williams 558897b4b9 svn merge -r 132139:132140 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-5
In the webkit plugin, don't try to load web browser plugins except on Windows.  The flash plugin on the Mac crashes the webkit plugin when running under xcode.
2009-08-29 01:08:36 +00:00
Steven Bennetts 0aa2bc4831 svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2
Bug Fixes:
* EXT-637 EXT-595
Dev work:
* EXT-694
QA:
* Be sure feature works on other locales
Known issues:
* If old Calling Card of person who presents in the friend list is removed - "Do you want to remove ..." dialog is shown, if old Calling Card of non-friend is removed it is removed in the old way without any alerts.
* It is possible to create 2 deep level subfolders under the Calling Cards/Friends/ subfolders. This should be disabled due to Accordion does not support tree hierarchy.
* If friendship is removed when agent is offline, Friend Card is not removed from Inventory.
2009-08-28 22:58:17 +00:00
Steven Bennetts 51500f82e2 svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
2009-08-28 22:30:09 +00:00
Steven Bennetts b2b980d697 Updated eol properties on .xml files
Added test_apps to ignore list
2009-08-28 20:35:10 +00:00
Nat Goodspeed 76aa6cc293 DEV-38596: Introduce Mani's LL_ADD_INTEGRATION_TEST macro.
LL_ADD_INTEGRATION_TEST supports tests that may require linking against one or
more Linden libraries, or that should be executed with a wrapper script.
Use this to test lllazy.cpp, llsdmessage.cpp and llcapabilitylistener.cpp.
2009-08-28 19:13:13 +00:00
James Cook eda3831041 skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.
CHANGES:
minor layout change: "start location" and "remember password" weren't on the same horizontal line.

DEV-35120 image_unselected art was "transparent.j2c" - switched it out for PushButton_Off

I18N: more things are missing a.. you guessed it, a name= parameter. Breaks localization.

forgot to check this in earlier...fixes off-by-one crash when editing a script

DEV-36740 change the displayed string per Erica's request re 'You can only set your Home Location...'  VIEWER-SIDE text change.  This does not change the actual message coming from the server

EXT-689 Odd spinner behaviour - For Sale Price -- reviewed by james

DEV-26973 Internationalize the server msg Youcan'tset this place as home -- reviewed by james

EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- reviewed by james

EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- to be reviewed

EXT-655 Cannot choose Both logging options in Preferences -- to be reviewed

Changes to notifications.xml text to fit Style Guide and some renamed menu items

EXT-147 Ongoing revisions to new gestures layout.

DEV-35097 catch more instances of 'SLURL' and make them 'SLurl'

Removed Info Displays and Buy Currency Test from top menus.

Clean up code to use proper childGetFoo and childSetFoo calls, as well as setCommitCallback using slots.

De-inlined LLAvatarIconCtrl paramblock constructor because I was doing a full rebuild anyhow.

Commented about use of childSetCommitCallback().  De-inlined LocalizedString paramblock constructor.

eliminated memory leak

I18N: more things are missing a name= parameter, breaks localization.

EXT-714 Updated panels in sidetray that were not using the scroll_container element to adjust for viewer heights.

fix for llmessage_test crash in Windows Release builds

DEV-11254 I18N: replace all string instances of "Second Life" - do this in the foreign languages too

DEV-11254 I18N: replace all string instances of "Second Life" - found new instances from merged code

potential fix for unit test crash on parabuild, moved statics into singleton member variables to get around potential dual instantation of statics on different modules

DEV-36809 Click target for slider handles is too small -- reviewed by steve

EXT-403 change getChild<LLSpiner> to LLUICtrl to make it generic -- reviewed by richard

DEV-35938 Horizontal scroll thumb too high -- to be reviewed

EXT-386 clean up warnings - initCommitCallback...

Rename Product Engine's LLFloaterMiniInspector to LLInspectAvatar, clean up XUI XML, clean up construction code, move refresh method to postBuild() so widgets are constructed before refresh, fixed a member variable in llavatarlistitem.cpp.  Reviewed with Leyla.

Login menu > Debug > Avatar Inspector shows test avatar inspector.  Also added to main menu > Debug > XUI > Avatar Inspector.  Changed text/layout of dummy inspector.  Not reviewed.

Merging revisions 131558-131975 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 into D:\viewer-2.0.0-3, respecting ancestry
2009-08-28 16:51:34 +00:00
Steven Bennetts 9e2cb2f4a0 DEV-38942 Eliminate startModal() from LLModalDialog
Also moved TOS and Critical floaters to login debug menu for testing
2009-08-28 08:04:26 +00:00
brad kittenbrink d020dae7b9 Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 merge (r131929).
Some minor post-merge cleanups still required.
2009-08-27 16:25:02 -04:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Adam Moss 71344b233d svn merge -c-131881 .
back-out DEV-32831

it annoys install.py but goodness knows why.
2009-08-27 08:51:31 +00:00
Adam Moss dcfb520c56 DEV-32831 Win32: freetype 2.3.9 upgrade
patch by brad.
2009-08-27 08:08:57 +00:00
Steven Bennetts 71d48254e8 EXT-730 - Crash in LLHUDEffectLookAt::calcTargetPosition 2009-08-26 23:46:04 +00:00