62d9db2f21
Automated merge with http://hg.secondlife.com/viewer-development
2011-10-15 18:14:23 -07:00
984feefbec
merge
2011-10-14 17:56:55 -05:00
9206226a37
tooltips now only show labels for toolbar buttons when label is hidden or truncated
...
tooltips are no longer instantaneous once a tooltip is visible
2011-10-12 18:16:59 -07:00
7fd0e8c69e
fixed toolbar context menu
...
deprecated pointless LLView::deleteViewByHandle
2011-09-26 18:51:43 -07:00
bd02cdc75f
merge
2011-09-26 19:27:10 -05:00
ad9c28a269
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-26 15:44:21 -04:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
993dff2ea0
Fix new LLView::childFromPoint(recur=true) behavior: was always NULL.
...
The recursive logic always used to recur to the point where there were no
children -- where the next level of recursion returned NULL -- and then return
that NULL. Fix so when that lowest-level call returns NULL, we return one
level above that.
2011-09-12 23:06:43 -04:00
72913ddf49
EXP-1196 FIX Fix param block template ordering
2011-09-08 22:35:53 -07:00
2d19a20025
add getInfo to LLView to get state information about ui elements.
2011-09-08 09:46:04 -05:00
fef401a176
build fix
2011-09-06 16:05:03 -07:00
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
b59c0a6680
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-06 13:58:47 -04:00
71aec7439c
CHOP-763: Introduce static LLView::getPathname(LLView*).
...
Use it for LLWindowListener to safely report an LLView* which might be NULL.
2011-08-30 15:22:44 -04:00
f08de06bf2
fix crash bug; exclude root from path.
2011-08-30 13:30:18 -05:00
6e8ba7e117
CHOP-763: Introduce LLView::getPathname().
2011-08-30 09:53:43 -04:00
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
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
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
b6685b5872
EXP-1065 FIX -- Inventory has slowed to a crawl. Clicking between items has an average one second delay. Same with switching between tabs.
...
* Removed numerous places in the code that called findChild across the inventory panel unnecessarily.
* Conglomerated uses of inbox and outbox inventory panels to the sidepanel class so the pointers can be cached and functionality like selection handling can be done more efficiently.
* Optimized LLView::childHasKeyboardFocus() to work backwards up from the focus object rather than searching for children that may or may not turn out to have focus.
Reviewed by Richard.
2011-08-08 15:13:53 -07:00
f09cabd4b0
EXP-970 FIX Group Roles > choose name causes other UI to become disabled
2011-06-30 16:15:10 -07:00
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
7cecf9ed8d
SOCIAL-659 WIP Viewer crash when selecting report option from mini-inspector in minimal and standard skin
...
turned error into warning when removing non-existent child
2011-03-09 15:26:56 -08:00
92403b4ea1
SOCIAL-593 FIX Profile Window cannot be resized in minimal skin
...
floater view snapping rectangle is now driven by floater_snap_region view
2011-03-02 21:05:03 -08:00
618249155a
Automated merge up from viewer-development
2010-12-13 10:08:55 -05:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
67be46c78a
made mIsFocusRoot a XUI param
2010-09-28 17:12:50 -07:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
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
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
dcebc01149
made LLView::getUseBoundingRect() const and used it internally
2010-09-16 00:41:45 -07:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
0daa627db4
removed LLLayoutStack::fromXML custom xml parsing
2010-08-24 11:44:28 -07:00
65c9914d23
made Params parsers not act as singletons
2010-08-23 11:03:19 -07:00
c20bd2dfee
cleaned up LLUICtrlFactory...
...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
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
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
b95ad3b5ce
further UI rendering performance improvements
2010-07-30 15:17:32 -07:00
d72a21aca1
further UI rendering performance improvements
2010-07-30 15:17:32 -07:00
5a8715f827
added LLPanel::childSetAction() that does not take a void* argument
...
implemented childGetVisibleTab/PanelWithHelp using breadth-first-search iterator
moved tentative state from llview to lluictrl
changes llcallbackmap to use boost::function
2010-07-30 09:56:49 -07:00
989552161d
added LLPanel::childSetAction() that does not take a void* argument
...
implemented childGetVisibleTab/PanelWithHelp using breadth-first-search iterator
moved tentative state from llview to lluictrl
changes llcallbackmap to use boost::function
2010-07-30 09:56:49 -07:00
13202e744c
merge
2010-07-14 11:11:31 -05:00
7a54ce3cf6
EXT-7729 WIP LLWARNS: Tons of "Making dummy class..." warnings on startup
...
reviewed by Leyla
2010-06-22 13:42:55 -07:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05:00
9a96da9c96
Better branch prediction in UI rendering.
2010-06-04 00:11:08 -05:00
1655256c0c
UI rendering optimization.
2010-05-29 04:18:44 -05:00
cb05897152
EXT-6726 WIP Added handlers for most of Appearance SP context/gear menus.
...
Reviewed by Mike Antipov and Nyx at https://codereview.productengine.com/secondlife/r/428/
--HG--
branch : product-engine
2010-05-25 14:17:11 +03:00
5921f2c14b
EXT-7398 FIXED negative top/bottom coordinates do the wrong thing with topleft layout
...
reviewed by Leyla
2010-05-18 16:26:18 -07:00
b69a454aab
merge
2010-04-08 16:43:48 -07:00
70bbcf7c2d
EXT-5849 - crash in LLView::drawChildren()
...
added logging to help track down cause
2010-04-08 16:41:56 -07:00
63a0e89fb5
merge from hotfix to viewer-2-0 and resolve conflicts
2010-03-18 16:53:41 -04:00
b37a1a54fa
turning view deletion spam into a lldebugs
2010-03-16 17:48:29 -07:00
58afe469f9
Bizarrely hacky fix for EXT-6276 (#if LL_DARWIN out copyFromPrimarySubstring)
...
General gl state cleanup in llui.
Make llrender more gGL.begin/end friendly.
2010-03-12 13:01:50 -06:00
4ada9e7f15
fix
2010-03-05 18:19:29 -08:00
7cea645ba2
added some logging to help track down crash in EXT-5849
2010-03-05 17:38:21 -08:00
41a30a59fb
initial work changing topctrl to popup layer
2010-03-02 14:21:58 -08:00
8eba0c4029
Add some asserts to catch some null derefs that, at least, the render-pipeline code seems to be hitting.
2010-02-08 13:20:03 +00:00
2b22831dd0
ext-3307 - nearby chat stays scrolled at bottom
2009-12-18 15:18:16 -08:00
c84b6a28a0
made setupParams do coordinate flipping and negative coordinate magic only for XUI-based params
2009-12-17 11:49:41 -08:00
9ff869a6b2
Backed out changeset: 4d482c1ed041
2009-12-17 10:01:55 -08:00
e8fe81c4fc
Backed out changeset: cfa60aef8061, added setBlockFromValue so setting a LLRect param in code will set the individua
2009-12-16 16:04:09 -08:00
3a02b9ec88
added setBlockFromValue so setting a LLRect param in code will set the individual left, right, top, bottom values, for example
...
don't call setupParams when creating widgets from code
moved Multiple param constraints into BaseBlock to remove extra scoping
2009-12-15 19:33:18 -08:00
699e2e027b
added "value" attribute to radio_items to better support arbitrary data selection
...
moved LLRadioCtrl to internal implementation of LLRadioGroup
reviewed by Leyla
2009-12-15 14:21:04 -08:00
dc6ce7f782
Manual merge from default branch.
...
--HG--
branch : product-engine
2009-12-07 16:04:24 +02:00
c6177836ec
no ticket, minor refactoring.
...
add return value to notifyXXX functions, may be usefull
--HG--
branch : product-engine
2009-12-07 12:04:27 +02:00
58d65d58a9
EXT-2823 Find window: change default open location to the top-left of screen
...
EXT-2921 [BSI] Default location for Screenshot Floater hides expanded options off screen
reviewed by James
2009-12-30 15:34:30 -08:00
6feb42e009
De-inlined some UI param block definitions.
2009-11-30 15:45:15 -08:00
7d3b3cc474
Linker optimization - use "extern template" for commonly regenerated templates
...
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
b50ba67bd8
Revert extern template link optimization until I can build/test on PC
2009-11-29 10:19:17 -08:00
928b7cba3e
Linker optimization, use extern template for LLView::getChild<>
2009-11-25 22:00:15 -08:00
1eaab29a95
merge
2009-11-10 11:26:55 -08:00
c84624b2e9
clean up include llfontgl
2009-11-10 10:47:53 +08:00
4eb72a12a2
data driven layout of top-level UI elements
...
EXT-1219 Side tray slide-out animation
cleaned up some layout of bottom tray contents
reviewed by James
2009-11-09 15:29:47 -08:00
aa75245a1a
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-20 11:34:46 -04:00
8103710c05
Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
...
* Bugs: EXT-1414 EXT-1213 EXT-1539 EXT-1253 EXT-1446 EXT-1438 EXT-1233 EXT-1466 EXT-1446 EXT-1512 EXT-1231
* Dev: EXT-719 (landmarks) EXT-747 EXT-1446 EXT-1378 EXT-397 EXT-1476
* IM changes
2009-10-19 01:45:44 +00:00
4ea9361aa8
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-10-17 12:23:38 -04:00
ed84101a6e
Introduce LLView::isAvailable() to test enabled & visible.
...
Better term? The point of the method is to verify that a user could
actually interact with the LLView in question.
2009-10-17 12:00:12 -04:00
fbddb31638
removed usage of boost::true_type and boost::false_type
...
made debug mouse events use standard / separator instead of ->
reviewed by Leyla
2009-10-16 21:05:22 +00:00
15218864c3
EXT-1351 DEV-38496 Add "show rectangles" check to UI Preview Tool, which draws outlines of widgets and makes tooltips show their names and sizes. Used for localization to catch string truncations and fix them. Reviewed with Leyla.
2009-10-13 23:50:09 +00:00
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
6c70154cd1
converted focus change callbacks to use signals
...
replaced mFocusChangedSignal that PE added with our hierarchical focus mgmt
reviewed by Leyla
2009-09-30 01:00:51 +00:00
afcdda2e36
EXT-904 Build tools does not show tooltips on any checkbox
...
EXT-877 There is no tooltip with a date for Time indicator in Nav bar
EXT-860 Crosshairs and "Press ESC to..." warning are dislocated in mouselook mode when UI Size is not exactly set to 1.00 (Menu Me -> Preferences-> Graphics)
EXT-783 Script editor inserts text twice when using the editors paste, or choosing LSL elements from the pull-down list.
EXT-764 mis-location of cursor in edit script panel (fixed cursor width)
EXT-658 Inventory window's "Fetched Items" needs spacing
reviewed by James
2009-09-23 22:25:18 +00:00
536e38ad51
Merging render-pipeline-6-qa-2 into viewer-2
...
Self reviewed.
2009-09-22 11:11:45 +00:00
58bce2d205
merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-09-09 01:26:44 +00:00
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
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
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
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
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
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
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
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
923d84d08f
EXT-127: Tooltips don't disappear immediately after moving mouse out of object
...
reviewed by Austin
2009-07-10 20:43:08 +00:00
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
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
ade6bbb06c
merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3
2009-06-21 17:16:27 +00:00
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
Richard Linden