Commit Graph

73 Commits (ec5dbb60e71302a77f68cc604e7dfd52bcaa926a)

Author SHA1 Message Date
Tofu Linden f714e527c5 CID-415
Checker: DEADCODE
Function: LLToolPie::handleTooltipObject(LLViewerObject *, std::basic_string<char, std::char_traits<char>, std::allocator<char>>, std::basic_string<char, std::char_traits<char>, std::allocator<char>>)
File: /indra/newview/lltoolpie.cpp
2010-01-27 11:57:55 -08:00
Rick Pasetto f942ede38b Remove code that enables tooltip inspector hover over media object
(note: reverts changeset b6b3a58fdb30)
2010-01-22 18:12:33 -08:00
Rick Pasetto dc47f52e9f merge 2010-01-21 18:40:37 -08:00
Ramzi Linden cdae00e7f0 better fix of EXT-299 "Mute" still showing in avatar Context menu, although label says "Block"
The original fix at r6543 created a duplicate node, which breaks localization. Renaming that new node with a unique name=.
2010-01-19 16:01:49 -08:00
angela 9c0ce03d82 EXT-1341 Inspectors - Break LLToolPie::handleTooltip into smaller functions, handleTooltipLand vs. handleTooltipObject 2010-01-19 18:18:59 +08:00
angela 433eb89473 EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc) 2010-01-14 09:38:46 +08:00
richard de746544f4 EXT-4036 - change inspector tooltip image 2010-01-07 15:53:03 -08:00
richard ae274182a9 ext-4011 - sped up appearance of inspector affordances
reviewed by Erica
2010-01-06 17:53:57 -08:00
Rick Pasetto 5cd4fabccb EXT-3201: bring up inspector tooltip if object has media 2010-01-06 13:21:49 -08:00
Monroe Linden b282f04b31 Changed async picks in LLToolPie::handleMouseDown and LLToolPie::handleRightMouseDown to sync.
This fixes EXT-3658 ("DEV-44422 webprim doesn't get mouse up events from the Mac trackpad").

Reviewed by Richard.
2010-01-04 17:43:25 -08:00
James Cook 298c829bb7 Fix 3D object tooltip backgrounds appearing gray
Image "none" wasn't being properly converted to a NULL pointer,
so was drawing the default gray image.
Reviewed with Richard
2009-12-18 14:39:45 -08:00
richard 0d9bae83ed merge 2009-12-14 14:54:37 -08:00
Rick Pasetto da3ca7c5b9 Allow selection of media faces even if there is no impl. We record
the target object and use that fact to raise its interest level.

This is mostly a pass-off for monroe to take and run with
2009-12-14 12:03:44 -08:00
James Cook 4cca7eb425 EXT-299 "Mute" still showing in menu_pie_avatar.xml although label says "Block" 2009-12-09 18:26:34 -08:00
James Cook dab87201cd Partial EXT-3268 Object Profile option showing up in avatar 3D Context menu
Renamed gPie* and menu_pie_* to just gMenu* and menu_* because they are no
longer pie menus.  Created separate other-attachment menus.
Reviewed with Richard.
2009-12-09 16:37:08 -08:00
angela b6ad65c04e EXT-2094 Add click-to-zoom as a one-click settable option for objects 2009-11-19 15:02:05 +08:00
angela a35fbddb91 EXT-2094 2009-11-18 20:52:53 +08:00
James Cook e3236a906d EXT-2512 Turned off Hover Glow Objects by default.
Should resolve EXT-2499 EXT-2522 EXT-2514
Consider turning back on for Viewer 2.1 and tuning.
2009-11-16 13:47:54 -08:00
Leyla Farazha d181b84dfd EXT-1478 Tool-tip background and border colors are being ignored
EXT-2082   	 Multifloater preview tab container extends outside window border
EXT-773   	 odd notecard behaviour on closing an unsaved notcard
reviewed by Richard
2009-11-10 17:10:47 -08:00
James Cook 30467bda7c Show glow around interactive objects on hover. Glow shows through objects/avatars - this is expected.
Effect from DaveP long ago, hover code by me long ago, just changing the default setting.
2009-11-06 11:06:20 -08:00
angela b4af6c3da8 display the current URL in object inspector for media without going through media plugin 2009-11-03 14:14:39 +08:00
Leyla Farazha cb2febb017 merge 2009-11-02 14:16:59 -08:00
Leyla Farazha 43c5ab0be2 EXT-1744 1-click Sit object not spawning an object inspector
EXT-1810   	 Right clicking own avatar displayed semi-transparent menus
EXT-1927   	 Hook up Push-to-talk in Preferences > Advanced
reviewed by richard
2009-11-02 14:11:07 -08:00
angela e5c96332de media inspector adding current url, secure browsing and home page button 2009-10-30 17:59:47 +08:00
angela c3b2f98012 media inspector https icon 2009-10-30 08:11:56 +08:00
angela 07749af387 EXT-1954 Implement Inspector Info i rollover icon 2009-10-29 16:28:04 +08:00
angela 4f4be142b3 DEV-41714 Display a play/pause control for the inspected face if it contains time-based media 2009-10-29 00:12:17 +08:00
Monroe Linden 6d14996bab Fixes for several keyboard focus issues around prim media. 2009-10-27 17:52:05 -07:00
Monroe Linden 376deff7a3 Changes to match new version of llqtwebkit -- passing modifier keys through to most user events and using new scroll wheel event. 2009-10-23 14:28:21 -07:00
Mark Palange (Mani) b4275c5d48 merge 2009-10-16 18:13:53 -07:00
Monroe Linden 86787b58ed Major refactor of LLViewerMediaFocus and LLPanelMediaHUD.
LLViewerMediaFocus now tracks two separate objects:  the currently focused media object, and the media object that's currently being hovered over.  It no longer stores smart pointers to either the LLViewerObject or the LLViewerMediaImpl -- it now looks up both by UUID every time they're needed, and fails gracefully if either goes away.  This will prevent it from keeping objects from being deleted.

The poorly-understood "mouseOverFlag" has been expunged.

LLViewerMediaFocus no longer uses LLSelectMgr at all.  The object to focus on is explicitly passed between LLViewerMediaFocus and LLPanelMediaHUD instead of going indirectly through the selection manager.

LLViewerMediaFocus also no longer interacts with the pick from LLToolPie -- the data it needs from the pick (the object and normal vector) is passed explicitly.

LLViewerMediaFocus::setCameraZoom and LLViewerMediaFocus::getBBoxAspectRatio now have no dependencies on the LLViewerMediaFocus object -- all the data they need is passed in when they're called by the LLPanelMediaHUD.  I made them static member functions, but they could be moved to LLPanelMediaHUD or even made into file-scoped static functions.  The only reason I didn't do either of those is that it seems like they belong with the LLViewerMediaFocus code as opposed to the HUD.
2009-10-15 18:42:30 -07:00
Richard Nelson fd846da06c only add LLScrollContainers to text widgets when requested, saving on LLTextBox construction time
combined clip and scroll attributes of text editors and text boxes...if you want to clip text, you need to introduce a scrollbar
moved clear to LLTextEditor so that text boxes won't empty out when calling LLPanel::clearCtrls()
EXT-1354 - added optional wrapping to LLTooltips...inspector tooltips don't wrap, everything else does
added LLFastTimer::reset call on application init to prime timers for pre-login timing
fixed tooltips positioning incorrectly due to mis-sized tooltipview
eliminated hide_scrollbar param for text editors

reviewed by Leyla
2009-10-08 01:48:50 +00:00
James Cook 750f94ca69 EXT-1141 Remove one-click cursor icons from art directories. Cursor is now a hand for all one-click actions, at Erica's request. Deleted art files for Win/Mac/Linux, including repackaging the SDL binary download package. Reviewed with Kelly. 2009-10-07 00:15:11 +00:00
James Cook ff56ff8163 EXT-1335 Enable hover glow for interactive objects. Tied to Develop > Rendering > Hover Highlight Objects and off by default for now, pending a fix to EXT-1336, a problem with Low graphics settings. Reviewed with Leyla. 2009-10-06 17:14:30 +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
Monroe Williams cf9239cabc svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +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
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
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
Steven Bennetts db5cda2667 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1211 https://svn.aws.productengine.com/secondlife/pe/stable-1@1228 -> viewer-2.0.0-3
QA:
New movement and camera controls. Test all movement and camera behavior against spec and expected behaviors, including sitting & standing.
Many other changes to the bottom bar.
Changes to local chat behavior.
2009-08-03 22:25:48 +00:00
James Cook ca51e8f33d Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-27 16:50:01 +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
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
Steven Bennetts 39905b927d merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@873 https://svn.aws.productengine.com/secondlife/pe/stable@888 -> viewer-2.0.0-pe-4 2009-07-02 00:38:13 +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
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
Adam Moss fd46865a50 QAR-1040 maint-viewer-11 + OpenAL combo mergeme
svn merge -c104451
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/openal-maint-viewer-11-combo-r104448
2008-12-02 20:35:40 +00:00
Steven Bennetts d725e5b240 QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
Steven Bennetts da94c0eaa2 QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Karl Steifvater 52562e2e66 svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-picking-merge
QAR-698 / DEV-9985 add touch "position" information to touch-events in LSL
2008-07-23 21:20:19 +00:00