Commit Graph

19666 Commits (f7a6ed85e40f53e5e28868bf34ac4dbc9bb204fb)

Author SHA1 Message Date
Nat Goodspeed f7a6ed85e4 CHOP-763: Add LLView::TemporaryDrilldownFunc to support UI injection.
Instead of unconditionally calling LLView::pointInView(),
LLView::visibleAndContains() now consults a class-static boost::function
called sDrilldown -- which is initialized to LLView::pointInView().
Introduce LLView::TemporaryDrilldownFunc, instantiated with a callable whose
signature is compatible with LLView::pointInView(). This replaces sDrilldown,
but only for the life of the TemporaryDrilldownFunc object.
Introduce llview::TargetEvent, an object intended to serve as a
TemporaryDrilldownFunc callable. Construct it with a desired target LLView*
and pass it to TemporaryDrilldownFunc. When called with each candidate child
LLView*, instead of selecting the one containing the particular (x, y) point,
it selects the one that will lead to the ultimate desired target LLView*.
Add optional 'recur' param to LLView::childFromPoint(); default is current
one-level behavior. But when you pass recur=true, it should return the
frontmost visible leaf LLView containing the passed (x, y) point.
2011-08-25 14:40:53 -04:00
Nat Goodspeed a548fd52e3 CHOP-763: Collect nontrivial LLView::childrenHandle*() methods.
There are 5 remaining childrenHandleSomething() methods with nontrivial bodies
-- the rest all forward to one of those 5. Move them all to be physically
adjacent in the source file to make it easy to compare/maintain.
2011-08-11 17:54:27 -04:00
Nat Goodspeed a44fb94af2 CHOP-763: Reduce redundancy in LLView::childrenHandle*() methods.
There were 13 different methods that were more or less clones of each other.
Consolidate those down to 5 variations on the basic method body, where each
variation has good (commented!) reason to differ.
Use helper methods to further simplify the remaining distinct method bodies.
Use BOOST_FOREACH() to improve readability of iterating over mChildList.
2011-08-11 17:41:54 -04:00
Nat Goodspeed 45b1b6ff3b CHOP-763: Remove redundant KEY string names from llwindowlistener.cpp.
A couple of the lookup tables in llwindowlistener.cpp essentially duplicated
LLKeyboard::keyFromString() and maskFromString(). Remove those tables and use
LLKeyboard lookup methods instead.
2011-08-03 16:04:45 -04:00
Oz Linden 1ba2176292 merge changes for storm-1474 2011-07-27 20:12:37 -04:00
Oz Linden 825fc273ee merge fix for SH-2031 2011-07-25 14:38:02 -04:00
Oz Linden 4c32fb0455 increment viewer version to 2.8.3 2011-07-25 10:58:48 -04:00
Oz Linden 723d05e6df Added tag 2.8.2-start for changeset 54bc7823ad4e 2011-07-25 10:58:11 -04:00
Oz Linden b8be8820ea close head created by 54e071a92450 2011-07-25 09:49:58 -04:00
Oz Linden e072806525 merge changes for storm-1458 2011-07-25 09:48:57 -04:00
Dave Parks b26ff4b4ed SH-2031 Fix for bad vertex shader/fragment shader varying usage. 2011-07-25 00:00:04 -05:00
Dave Parks 0ebf271a58 merge 2011-07-24 16:19:55 -05:00
Dave Parks 6465218f18 Go back to useful head 2011-07-24 16:18:39 -05:00
Dave Parks 578e44d9b8 dummy check in to make hg happy 2011-07-24 15:55:44 -05:00
Dave Parks a5769e8126 terminating accidental merge
--HG--
branch : oops
2011-07-24 15:44:46 -05:00
Dave Parks 0f86c26fa5 merge 2011-07-24 15:10:13 -05:00
Oz Linden 6df418b7af merge changes for storm-1526 2011-07-22 22:07:50 -04:00
Dave Parks 26a9a6929c SH-2031 Fix for sometimes deadlocking a curl thread. 2011-07-22 16:22:51 -05:00
Oz Linden 7ac2307501 merge back release branch changes 2011-07-22 10:46:25 -04:00
Nat Goodspeed d28e411af6 Automated merge with http://hg.secondlife.com/viewer-development 2011-07-22 10:01:42 -04:00
Oz Linden ebbadcf772 merge changes from snowstorm team review build 2011-07-22 09:06:42 -04:00
Paul ProductEngine 298bb68484 STORM-1474 FIXED Implement Show Last Search in viewer chrome
- Minimize the search floater on teleport
2011-07-22 15:22:59 +03:00
Dave Parks e4a8ef4ce2 SH-2031 Cleanup from threaded curl implementation (remove errors/loops on shutdown). 2011-07-22 02:33:55 -05:00
Dave Parks c337888553 SH-2031 Disable usage of glMapBuffer (again). Despite using MapBufferRange, this is still a source of frame stalls. 2011-07-22 01:07:48 -05:00
Dave Parks 7b6afd1eba SH-2031 Followup to curl threading work -- don't start and stop the thread on every request, use a signal (cuts time spent in Pump IO down from 1-2 ms to 0.1ms) 2011-07-21 23:33:23 -05:00
Dave Parks 764a13a196 SH-2031 Don't do network I/O from the main thread in llcurl.
Reviewed by Kelly
2011-07-21 17:35:04 -05:00
Oz Linden c118ec2099 merge up changes for 2.8.0 release 2011-07-21 15:02:03 -04:00
Dave Parks 65d82fe192 SH-2031 Fix for stall in "Cleanup" 2011-07-21 13:10:28 -05:00
Oz Linden d26356d7e1 merge changes for storm-1519 2011-07-21 09:32:10 -04:00
Oz Linden dcc57bbb0e merge changes for eli2_viewer-development 2011-07-21 09:30:22 -04:00
Oz Linden 91bc7e34cf merge late beta fixes 2011-07-21 09:25:46 -04:00
Oz Linden 09c18af318 merge changes for release tags 2011-07-21 09:25:08 -04:00
Dave Parks aaecc4c53c SH-2020 Fix for avatar skin/eyes and trees being bright/black/busted underwater. 2011-07-21 00:42:48 -05:00
Dave Parks e52caca712 SH-2048 Fix for invisiprims infecting neighboring prims with their invisi-ness. 2011-07-20 23:50:44 -05:00
Dave Parks 78f1bad0e6 SH-2021 Fix for black water at the horizon from occlusion culling madness. 2011-07-20 17:56:22 -05:00
Dave Parks 26568d5c98 SH-1838 Add error handling for allocation of off screen render targets.
Reviewed by Leslie
2011-07-20 16:06:04 -05:00
eli cec8d8b3e6 FIX INTL-58 set25, light set4 translation for 6 languages 2011-07-20 13:56:21 -07:00
Debi King (Dessie) c567f0dcdd Added tag DRTVWR-68_2.7.5-release, 2.7.5-release for changeset 6866d9df6efb 2011-07-20 16:43:32 -04:00
Christian Goetze (CG) 6d86a36b84 Re-indent teamcity service messages when scanning build logs to fix incredibuild formatting. 2011-07-20 11:48:57 -07:00
Christian Goetze (CG) 299615e9d6 Re-enable public build status indicators 2011-07-20 11:48:19 -07:00
Leslie Linden 76249c58f6 SH-2038 FIX -- [PUBLIC] Severe performance drop on MacBook Pros
EXP-997 FIX -- Significant FPS degradation in 2.8.0 Beta on Mac equipped ATI video card

* Disabled VBO's on mac to avoid stalls in renderer
* Placed valid data into the padding between triangles in the vertex buffer to remove uninitialized craziness
* Removed invalid rendering checks causing GL errors in debug mode

Reviewed by davep
2011-07-19 13:31:32 -07:00
Oz Linden f45747e524 merge changes for storm-1487 2011-07-19 15:45:31 -04:00
Oz Linden 20e08f6aa7 merge changes for storm-1221 2011-07-19 15:45:15 -04:00
Oz Linden 41890cfee8 merge changes for storm-1502 2011-07-19 15:44:19 -04:00
Oz Linden 51f251b2d5 merge changes for storm-1503 2011-07-19 15:44:00 -04:00
Oz Linden 181c34c984 merge changes for vwr-26066 2011-07-19 15:43:38 -04:00
Oz Linden aebeac6898 merge changes for storm-1476 2011-07-19 15:43:12 -04:00
Paul ProductEngine 880a7ebb92 STORM-519 FIXED "Delete" is enabled in the context menu for folders which contain worn items
- Disable "Delete" menu item in case selected folder contains non-removable items.
2011-07-19 21:24:56 +03:00
Vadim ProductEngine 563c942a34 STORM-1487 FIXED Changed the "get more gestures" marketplace URL. 2011-07-19 21:21:11 +03:00
Seth ProductEngine cf8c7701df STORM-1221 FIXED Hard coded dates made localizable under Group Profile Land/Assets.
Added a function for parsing a date string of specific format.
Added strings defining the date format in Group Profile Land/Assets that should be localized.
2011-07-19 20:04:24 +03:00