Commit Graph

182 Commits (bd008a170898e69beeb8bc0481b4bfd94de86c55)

Author SHA1 Message Date
Richard Linden 3861249a74 use lazy deletion of views via die() method to avoid some potential crashes 2012-01-03 09:41:16 -08:00
Paul ProductEngine ba2fa73aaa EXP-1472 FIXED (More spillover list scrolls up after selecting any content menu item)
- Saving last scroll position of menu
2011-11-01 18:54:21 +02:00
Richard Linden d0cda13235 EXP-1275 FIX A UI element or Keyboard shortcut to clear the viewport
Ctrl+Shift+U now toggles UI and hides floaters
refactored main_view.xml
made all members of llviewerwindow private
2011-10-11 22:49:00 -07:00
Richard Nelson 7fd0e8c69e fixed toolbar context menu
deprecated pointless LLView::deleteViewByHandle
2011-09-26 18:51:43 -07:00
Richard Linden b183b6f141 EXP-1196 FIX Fix param block template ordering
changed ordering of template loading relative to constructor setting of params
moved a lot of constructor-set params to template files
reviewed by Leslie
2011-09-06 14:45:11 -07:00
Richard Linden 84b179b0bf Automated merge with file:///F:\code\viewer-autobuild2010 2011-03-28 17:38:54 -07:00
Richard Linden a5572505d8 SOCIAL-509 FIX There is no way to copy a user name from web profile with the mouse 2011-03-24 19:37:00 -07:00
Paul ProductEngine 2453ccbd3e STORM-659 FIXED Viewer hangs when navigate in the Back/Fwd Teleport history by keyboard
Reason:
If user didn't set number of max scrollable items (msi) then msi = U32_MAX

Solution:
If user didn't set number of msi then number of scrollable items = number of items in menu.
2011-03-11 20:33:06 +02:00
Seth ProductEngine b48c003d60 STORM-387 FIXED Return key handling by Favorites bar overflow menu.
Pressing Return in Favorites bar overflow menu now acts as mouse double click, i.e. performs teleport to selected landmark.
2011-01-06 22:19:27 +02:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Richard Linden 5080a19afa EXP-230 FIX "elp" text flashes on and off in upper left corner of skylight viewe 2010-10-18 16:55:20 -07:00
Seth ProductEngine 401fdbcfac STORM-294 FIXED keyboard navigation in Favorites bar overflow menu.
The menu items can now be scrolled cyclically with a keyboard even if not all items are visible at once.
2010-10-13 00:54:57 +03:00
Monroe Linden 69215ae757 Fix for EXP-140 -- After logging into Skylight Viewer - User is required to click on Viewer window before using movement keys / flying
In LLMenuHolderGL::handleKey(), in the highlightNextItem() case, don't return true if highlightNextItem() did nothing.

Reviewed by Richard.
2010-10-04 18:21:08 -07:00
Richard Linden 3bab3fc661 fix for crash on exit
also made handle subtyping work
2010-09-29 15:02:32 -07:00
Richard Linden ee50f389fd made menus work with empty contents 2010-09-28 17:11:27 -07:00
Richard Linden c4cfd1df44 don't show empty context menus 2010-09-28 14:21:54 -07:00
Richard Nelson ad440a68bb merge 2010-09-27 09:46:20 -07:00
Richard Linden f8a17515f5 EXP-109 WIP strip down main_view.xml
made menu keyboard access only work when menus are visible
dummy widgets are now added with a parent view that is invisible
popupview can now be default-built
2010-09-22 12:27:26 -07:00
Boroondas Gupte 1b4ae0e053 merged VWR-20583 2010-09-02 19:34:26 +02:00
Boroondas Gupte 3e299ab764 VWR-20583 FIXED submenu indicators (▶ a.k.a. U+25B6) shouldn't be hard-coded
in context menu sub menu names

Use the same mechanism for adding the triangle in LLContextMenuBranch as
is already used in LLMenuItemBranchGL. As a bonus, the triangles will be
nicely right-aligned, just as in the main menu.

Remaining hard-coded triangles all are in indra/newview/skins/default/xui/*/panel_voice_effect.xml.
2010-09-02 18:29:42 +02:00
Tofu Linden 741d944c89 some follow-up for VWR-17801. 2010-09-01 16:51:53 +01:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Paul Guslisty ec06fa16ec EXT-8424 FIXED ([HARD CODED] ALL LANGS: \"More\" menu option is untranslated under Advanced menu (French viewer) > Shortcuts)
Set translated label from strings.xml

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/831/

--HG--
branch : product-engine
2010-08-04 11:45:47 +03:00
Vadim Savchuk 45adf1d612 EXT-8501 FIXED Check menu items always looked as checked.
Reason:
Check menu items (instances of LLMenuItemCheckGL) had used LLUICtrl::getValue() to know whether they should draw the checkmark.
Recently this was broken when getValue() was overriden in LLMenuItemCallGL to return a string.

Fix:
Overriden getValue() in LLMenuItemCheckGL to return a boolean value, not a string.

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/821/

--HG--
branch : product-engine
2010-07-29 17:48:41 +03:00
Alexei Arabadji a8632670db EXT-6739 FIXED Provided updating of object inspector gear menu 'Touch' and 'Sit' entries.
Details:
1 Provided using Object.EnableSit and Object.EnableTouch callbacks for both object menu and inspector gear menu. Now default menu item label stores in
hash map and since callback receives triggered control no need to hardcode updating menu item labels from callback.
2 Removed redundant attribute 'parameter' from menu xml's since now handler callbacks receives triggered menu item as function parameter.
3 Replaced LLObjectEnableTouch class with enable_object_touch function, since there no need on triggering callback on menu commit event.
4 Added symmetric method LLMenuItemGL::getValue().
5 Removed unused "Object.EnableGearSit" callback.

reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/774/

--HG--
branch : product-engine
2010-07-23 17:06:27 +03:00
Richard Linden 6e961cd9f2 EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startup
improved filename output for XUI parser errors
2010-06-22 18:26:29 -07:00
Alexei Arabadji a3d2d2be2a Automated merge with https://hg.productengine.com/secondlife/viewer-trunk/
--HG--
branch : product-engine
2010-05-17 09:54:54 +03:00
Alexei Arabadji 8bd31fa351 EXT-7085 FIXED Added check to avoid showing invisible menu items.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/388/

--HG--
branch : product-engine
2010-05-17 09:53:56 +03:00
Yuri Chebotarev f9dff766a8 EXT-7000 FIX "eat" TAB key while menu is active
Two problems:
1. AvatarList didn't hide popup menu when goes invisible.
2. (Real problem) MenuHolder View didn't process TAB key. Which leads to changing active ("focused") control. Which leads to the ability (for example) to switch tabs and hide popup menu parent view.

--HG--
branch : product-engine
2010-05-17 09:49:33 +03:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
Richard Nelson 1e5fe95b1d EXT-6295 - Cannot log in with new account, TOS dialog does not load
reviewed by Mani
2010-03-10 18:20:18 -08:00
Leyla Farazha 2231da11dd EXT-4677 Crash when closing pinned menu which has no parent Inventory floater
Reviewed by Richard CC#118
2010-02-18 10:52:34 -08:00
Eugene Mutavchi 782cb6ee87 Fixed normal bug EXT-4702 (Elements of type context_menu cannot have font set in XUI xml)
--HG--
branch : product-engine
2010-02-05 17:09:22 +02:00
Tofu Linden 139e8be4e1 CID-339
Checker: UNINIT_CTOR
Function: LLMenuGL::LLMenuGL(const LLMenuGL::Params &)
File: /indra/llui/llmenugl.cpp
2010-01-28 10:28:41 -08:00
Tofu Linden 05260ba76d follow-up fix 2010-01-27 13:09:25 -08:00
Tofu Linden 668e72e290 CID-103
Checker: INVALIDATE_ITERATOR
Function: LLMenuGL::scrollItemsDown()
File: /indra/llui/llmenugl.cpp
2010-01-27 13:08:15 -08:00
Tofu Linden 706fd4d073 CID-103
Checker: INVALIDATE_ITERATOR
Function: LLMenuGL::scrollItemsDown()
File: /indra/llui/llmenugl.cpp
2010-01-27 13:06:26 -08:00
Tofu Linden 7efc0fbb4f EXT-4383 Replace ">" glyph in cascading menus with a proper triangle
patch by josh, reviewed by me
2010-01-15 12:41:51 -08:00
Mike Antipov 3c3271761b Merge with default branch, resolved conflict in llpanelavatar.cpp
--HG--
branch : product-engine
2010-01-12 12:53:44 +02:00
Runitai 2a00a16f57 EXT-3784 Fix for first menu item going blank when highlighted on ATI cards. 2010-01-11 11:21:52 -06:00
Vadim Savchuk 9393c28831 Merge from default branch.
--HG--
branch : product-engine
2010-01-11 12:57:42 +02:00
richard 1bbd259f2d EXT-3878 - Menus disappear when UI Size is < 1.00
EXT-3647 - Auto-scrolling of IMs should resume when user types in chat
EXT-3877 - Pinning two levels of menus prevents movement using arrow keys
EXT-1303 - Hyperlink text wraps in the middle of a word

reviewed by James
2010-01-06 11:17:38 -08:00
Yuri Chebotarev c0d189a3d1 fix for low EXT-2742 Invalid menu appearance after hiding navigation bar and/or favorites bar
actually that was designed behavior.

--HG--
branch : product-engine
2010-01-06 15:12:09 +02:00
Leyla Farazha 8e5b453ea0 EXT-3589 Favorites Appear Squished Together on Left Half of Favorites Bar
EXT-3602 	 Inventory > New Clothes sub menu not aligned
EXT-3631 	 Texture preview after upload > Image covers buttons
reviewed by James
2009-12-29 16:12:12 -08:00
Paul Guslisty dafd9e269f Fixed a memory leak in ContextMenu (EXT-3563).
--HG--
branch : product-engine
2009-12-25 17:18:51 +02:00
Nyx (Neal Orman) 1e922c2666 Automated merge with ssh://nyx@hg.lindenlab.com/viewer/viewer-2-0/ 2009-12-18 15:56:49 -05:00
Paul Guslisty 7cf60a0d57 Fixed normal bug EXT - 2863 ([BSI] Group Chat List Names right click do not contain view profile or send private message)
--HG--
branch : product-engine
2009-12-18 16:44:16 +02:00
Leyla Farazha ab93c0ffb5 EXT-3534 Default Location Obscures the Top of an Open Notecard When Nav and/or Favorites Bar are Hidden
EXT-3334 	 [BSI] Chat/IM log preferences not retained
EXT-3402 	 Replace "X" for checked menu items with a check mark glyph [Patch Included]
reviewed by richard
2009-12-17 16:15:46 -08:00
Leyla Farazha 27d6f0e49c EXT-3265 Gear menu on_visible params are broken - not setting visibility of menu items
EXT-2923 [BSI] My own inspector lists "Stand Up" as an option in gear menu, while I'm standing
2010-12-07 13:39:56 -08:00
Leyla Farazha dee4849616 EXT-2635 No message reminding user that a restart is required to reset cache (was Clear Cache)
EXT-2652 	 Favorites bar drop-down button (for when favorites exceed width of viewer) is not configurable via XUI
EXT-2227 	 [BSI] Preferences -> Setup -> Cache Location blank
EXT-1036 	 Clicking menu separators selects wrong menu option (allows selection of greyed-out option)
reviewed by James
2009-12-01 11:26:43 -08:00
richard 7fd1488c62 convert signals to allocate on demand in order to speed up widget construction
reviewed by James
2009-11-23 11:42:32 -08:00
richard 3b2d9f63e3 merge 2009-11-09 16:14:52 -08:00
James Cook 0b3bbf8cfc EXT-1501 Menu fonts now configurable in XUI, set size to SansSerifSmall 2009-11-06 13:51:16 -08:00
richard fac0b6836a refactored top level ui into main_view.xml 2009-11-05 20:36:15 -08:00
Leyla Farazha 0e63920569 merge 2009-11-04 15:09:57 -08:00
Leyla Farazha 0520ad677a EXT-1739 Preferences > Sounds > Device settings -- Input/Output controls don't work
EXT-2073   	 Need ability to change font style of tab headers
EXT-1505   	 Kill text drop shadow on Menu and Tabs
reviewed by Richard
2009-11-04 15:06:56 -08:00
richard 995c18b1c7 removed picture_style from LLButton::Params and allow empty labels 2009-11-02 19:28:24 -08:00
James Cook b444964952 EXT-1962 Back button drop down menu now aligns to button.
LLNavigationBar was passing coordinates to LLMenuGL::showPopup() in the wrong
coordinate frame.  Added comments to LLMenuGL to clarify which coordinate
frame to use.  Not reviewed.
2009-10-30 11:37:16 -07:00
James Cook 432e243e1a EXT-1352 Add image art to floater backgrounds.
Implemented "legacy_header_height" hack to account for new art being 25 pixels
tall instead of legacy 18 pixels -- it auto-sizes the floaters to be taller.
Made all floaters have resize handles, just disable and make invisible if unused.
This simplifies the floater construction logic.  Floater header height now lives
in floater.xml, not as a global saved setting.  Reviewed with Richard.
2009-10-29 15:37:25 -07:00
Adam Moss 406927f629 Merge a big bunch of fixes from maint-viewer. Hooray.
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9

DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +00:00
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Martin Reddy b5724bc0e9 SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
fixes all of the parentheses warnings in the code.

Original patch was reviewed by merov (and others).
2009-09-25 16:51:25 +00:00
James Cook 01c7b50edb EXT-646 Pinned menus display incorrectly. Menu needs to follow bottom-left corner to avoid being pulled up when floater resizes to accommodate. Fixed floater height computation, removed magic numbers. Added XML configuration file for menu_item_tear_off so we can set colors to make the lines visible when highlighted. Reviewed with Richard. 2009-09-23 18:45:51 +00:00
David Parks 536e38ad51 Merging render-pipeline-6-qa-2 into viewer-2
Self reviewed.
2009-09-22 11:11:45 +00:00
Steven Bennetts 4601aef70a merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -> viewer-2.0.0-3
Fixes: EXT-839 EXT-859 EXT-868 EXT-795 EXT-861 EXT-678 EXT-848 EXT-873
2009-09-09 04:27:06 +00:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +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 af98aad98d svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1471 https://svn.aws.productengine.com/secondlife/pe/stable-1@1476 -> viewer-2.0.0-3
EXT-65 EXT-270 EXT-359 EXT-361 EXT-367 EXT-367 EXT-368 EXT-455 EXT-468 EXT-530 EXT-539 EXT-540 EXT-542 EXT-545 EXT-555 EXT-557 EXT-558 EXT-559 EXT-559 EXT-560 EXT-561 EXT-562 EXT-563 EXT-564 EXT-566 EXT-568 EXT-569 EXT-570 EXT-571 EXT-581 EXT-590 EXT-594 EXT-596 EXT-597 EXT-601 EXT-602 EXT-603 EXT-613 EXT-620 EXT-624 EXT-628 EXT-630 EXT-631 EXT-632 EXT-639 EXT-640 EXT-641 EXT-642 EXT-662 EXT-671 EXT-672 EXT-676 EXT-682 EXT-692 EXT-703 EXT-717
2009-08-26 20:47:27 +00:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
James Cook d53725ece1 EXT-549 Viewer crash when attempting to close detatched top menu. LLTearOffMenu wasn't registering its closeTearOff method because postBuild() isn't called because it isn't built from XML. Moving registration of closeTearOff to the constructor fixes it. Discussed with Steve, but not reviewed formally. 2009-08-18 00:43:56 +00:00
Steven Bennetts 73caee4208 svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1331 https://svn.aws.productengine.com/secondlife/pe/stable-1@1340 -> viewer-2.0.0-3
EXT-269 EXT-274 EXT-276 EXT-277 EXT-282 EXT-296 EXT-342 EXT-370 EXT-379 EXT-394 EXT-398 EXT-405 EXT-407 EXT-410 EXT-413 EXT-414 EXT-450 EXT-456 EXT-477 EXT-482 EXT-496
2009-08-14 21:50:02 +00:00
Steven Bennetts 0bf4b5f222 merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https://svn.aws.productengine.com/secondlife/pe/stable-1@1297 -> viewer-2-0
Fixes:
EXT 208 EXT 366 EXT-211 EXT-245 EXT-246 EXT-278 EXT-279 EXT-280 EXT-298 EXT-301 EXT-304 EXT-311 EXT-317 EXT-318 EXT-319 EXT-339 EXT-343 EXT-344 EXT-346 EXT-349 EXT-350 EXT-351 EXT-354 EXT-355 EXT-358 EXT-360 EXT-362 EXT-369 EXT-372 EXT-374 EXT-381 EXT-382 EXT-383 EXT-395 EXT-396 EXT-412
Other changes:
Movement & Caemra controls work
Profile and Me panel refactoring
Notification refactoring
2009-08-12 01:12:27 +00:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
Steven Bennetts e97f7728a9 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3 2009-07-30 23:22:41 +00:00
James Cook 8f7ec64899 Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
James Cook 9ad6434bb7 DEV-34977 Context menu fails to open in Build mode. Product Engine implemented context menus as spawning on right-mouse-up, which interacts poorly with LLToolPie and recycled pie menu code. Changed context menu spawn to right-mouse-down, which allows click-drag-select behavior like the Mac. Eliminated unnecessary LLContextMenu::handleMouseUp and handleMouseDown methods -- these are handled in the LLMenuGL base class. Added handleRightMouseUp to LLMenuHolderGL to hide menus on right-mouse-up outside the menu. Reviewed with Richard. 2009-07-21 19:00:58 +00:00
Leyla Farazha 7cdaba2332 Fixing DEV-35175 regression.
Context Windows will now spawn up if too far down, and spawn left if too far right.
reviewed by James
2009-07-15 01:12:51 +00:00
James Cook 83a6ea234f Merge skinning-15 to viewer-2. Fixes include:
DEV-35175 Spawning context menu should not move mouse cursor (Note: introduces regression where menu can fall off bottom of screen, will fix shortly)
DEV-35143 Modal alerts appear behind side tray
DEV-35141 Landmarks image and description outside of landmarks
Merging revisions 126418-126419,126726-126727,126856-126857,127010-127011,127014-127016 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-15 into G:\viewer-2.0.0-3, respecting ancestry
2009-07-14 19:06:17 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +00:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
Austin Doupnik 687cff0eb8 [EXT-68] Fixed dynamic_cast on partially destroyed object bug that was breaking menu branching. 2009-06-30 21:34:46 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Brad Kittenbrink 087bd26553 Merge of QAR-1383 event-system-7 into trunk.
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
Adam Moss 9dfe0ca9a0 svn merge -r121194:121210
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1

QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-22 09:58:47 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
Adam Moss e188badaf2 QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergeme
svn merge -r108355:109316
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314

Whew.
2009-02-03 17:56:26 +00:00
Mark Palange 446c55538e svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-13 03:46:56 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Mark Palange f89f19990c QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release 2008-11-07 17:51:03 +00:00
Steven Bennetts b9b4a4d934 QAR-782 Merge featurettes batch #2
merge featurettes-6-merge-2 -> release
dataserver-is-deprecated
2008-08-13 19:37:05 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Steven Bennetts ad33281007 QAR-650 - Viewer RC 9 merge -> release (post cmake)
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
James Cook 2b863df7c8 svn merge -r87877:87878 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-ui/maint-ui-12-qa-5 which is the last iteration of the maint-ui series of branches. Future work will be in featurettes. 2008-05-20 23:24:16 +00:00
Steven Bennetts b5936a4b1d 1.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release
QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release
QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release
QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release
(Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
2008-04-03 19:21:14 +00:00