5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
4acc2dc273
Merge viewer-release
2014-02-10 15:42:25 -08:00
52ec6f9af0
remove excessively complex fixes for MAINT-2914 and MAINT-3142
2013-11-26 15:09:55 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
cfcf6d9bd4
MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom toolbar buttons and "lost".
2013-09-26 00:34:00 +03:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
f8e5ae8006
MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797)
2013-10-04 14:04:31 +03:00
90d1c5b367
Merge downstream code for CHUIStorm
2013-08-26 15:45:09 -07:00
01a7002228
MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom toolbar buttons and "lost".
2013-09-26 00:34:00 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
48f702029f
MAINT-2914 FIXED Mousing over UI elements does not make them light up
2013-08-02 18:00:08 +03:00
0cf9597bd5
CHUI-926 FIXED FUI button will stay highlight(orange) if there are unread IMs when the conversation floater is minimized.
2013-06-11 15:30:31 +03:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
0f24668b0a
Merged in Chui beta6+ fixes
2013-03-29 10:37:58 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
abf1bf79f2
CHUI-881 ([CHUIBUG]Viewer crashes when user drag and drop the participant from the people floater to the one of the tool bars): Problem was that the item dragged from the people list was not of type inventoryitem. Instead of casting to an inventoryitem and checking if the item being dragged is a widgit, instead look at the cargo type (which also specifies that the dragged item is a widgit but doesn't need to typecast).
2013-03-21 16:16:54 -07:00
7b4d27ecbc
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
collapsed Orientation enums to all use LLView::EOrientation
added ability to display stat bar horizontally
2013-03-14 19:36:50 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
f944608ab9
CHUI-707: "Chat" toolbar button stop flashing after setting toolbar buttons view to "Icons only": save/restore flashing states
2013-02-06 20:00:43 +02:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
c61db3d380
Merge LGPL tip
2013-06-26 12:59:37 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
661f9aacd7
Added option for edge snapping based on the legacy method of toolbars changing the edge offsets
...
Includes one hack for chatbar being unable to return its own height correctly
2013-06-05 19:02:09 -07:00
4101c43f5f
Merged with viewer-sunshine tip (Revision 87a6fc812214)
...
--HG--
branch : RLVa
2013-02-20 19:25:10 +01:00
e1b955226d
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
...
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
edeeed9541
CHUI-531 FIXED Poor fps in CHUI viewer
2012-11-21 01:41:49 +02:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
7aca8ad6b8
MAINT-1534 Fix for calls to find widgets getting out of hand.
2012-09-11 15:55:36 -05:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
ddc6afdd81
Merged with default tip (Revision f8183e357a6f)
...
--HG--
branch : RLVa
2012-04-21 22:29:42 +02:00
d56be1f175
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
...
refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-07 12:31:48 -08:00
6e0666adc3
Merged with RLVa-1.4.5 tip
2012-03-10 21:38:23 +01:00
2c5e50f59e
Added optional control checkbox to push buttons, made AO command button use it to switch AO on and off.
2012-02-21 00:37:58 +01:00
1298ee9a9d
Added top, bottom, center, left and right alignment options to toolbars.
2012-02-20 16:59:12 +01:00
bdecd7aa44
Made command list able to use control_name buttons.
2012-02-20 15:10:45 +01:00
7488446f12
Backed out changeset 2d69be4d26b9
...
Clashed with Ansariel's changes
2012-02-20 14:53:19 +01:00
e43e224a4e
Made command list able to use control_name buttons.
2012-02-20 14:49:49 +01:00
906dea62dc
Nearby chat working, toolbar layouts mostly behaving.
2012-01-27 23:29:53 +01:00
33a17d8a83
EXP-1549 : Disable the Remove button menu item in the toolbar contextual menu if no button clicked
2012-01-11 17:43:17 -08:00
415aadc959
Merged with default tip (Revision 3a521e980fbf)
...
--HG--
branch : RLVa
2012-01-09 13:22:40 +01:00
b217a6ff7a
- fixed : disabling a toolbar button doesn't block the button's commit signal
...
--HG--
branch : RLVa
2011-12-17 19:49:04 +00:00
f0a2acd161
Added more layout options to toolbar context menus, added text only buttons, too.
2012-01-24 00:26:38 +01:00
d58b5342dc
EXP-1476 FIXED (Moving speak button to empty toolbar while incoming/outgoing call dialog is open does not move the dialog as well)
...
Reason:
A floater can be docked only to a button which is in visible chain, the visibility of the button itself is not enough.
After the button was added to the empty toolbar: mButtonAddSignal is called and the floater tries to dock to the button, but the button's parent(mButtonPanel) is yet invisible at this moment (so the button is not in visible chain). mButtonPanel visibility updates in draw() depending on whether it contains some buttons or not.
Solution:
Updating mButtonPanel visibility right after the button was added, before mButtonAddSignal
2011-12-02 19:10:08 +02:00
ede74731ab
EXP-1533 FIX -- As a FUI user, I'd like to be able to remove toolbar buttons without having to drag them anywhere
...
* Added "Remove this button" option to the toolbar context menu
* Added code to track the right mouse click and execute the action to remove the
appropriate button on the toolbar.
Reviewed by surly leyla
2011-11-03 14:36:40 -07:00
eee8a0e113
merge
2011-10-25 17:35:50 -07:00
a64f7e1c7b
EXP-1468 Incoming/outgoing call floater tongue position doesn't follow floater
2011-10-25 17:32:40 -07:00
a5f3c70eef
EXP-1469 FIX -- Changing toolbar from "icons only" to "icons with text" while incoming/outgoing call floater is open causes crash on mac
...
* Updated LLToolBar to call remove and add on all buttons when rebuilding the toolbar.
2011-10-25 15:52:08 -07:00
8448e3b86e
EXP-1398 FIX -- Viewer Crash when moving Speak button from bottom toolbar to side toolbar with call request dialog active on Mac
...
* Added "on button removed" callback for toolbars.
* Changed docking on incoming and outgoing call floaters to be undocked when "speak" button removed.
Reviewed by Leyla.
2011-10-25 14:14:46 -07:00
8d6e7fa02c
* Fixed destination guide floater to display on login based on per account
...
"DisplayDestinationsOnInitialRun" setting or initial agent SL login.
* Added toolbar enumeration for toolbar view so queries for commands can now
indicate where the command currently is on the left, right or bottom toolbars.
* Updated toybox toolbar button tooltips to indicate where the command currently
resides in the view.
* Added unused function to allow toolbar buttons to be changed to flash
indefinitely.
Reviewed by Richard.
2011-10-24 16:49:00 -07:00
0297f55c6d
EXP-1416 FIXED "Speak" and "Voice controls" buttons added as control views in LLTransientFloaterMgr to prevent hiding the transient IM floater.
2011-10-21 17:26:47 +02:00
4a90d9f3d6
* Moved the name storage on the LLCommandId back to the LLCommand itself.
...
Reviewed by Merov.
2011-10-20 12:40:02 -07:00
f3a4a48d8e
* Fixed issue where dragging disabled buttons from the toybox to the toybox
...
would remove them from the surrounding toolbars.
* Removed dead drag & drop code
* Fixed issue where saving didn't necessarily work because toolbar populated
with command id's that didn't have associated names.
2011-10-19 17:33:10 -07:00
d6be2b4904
EXP-1348 FIX -- Speak button activated when dragging and dropping between toolbars and moving back to Tool box
...
* Dragging and dropping the speak button will aggressively turn off the
microphone now, regardless of the initial state of the button.
Reviewed by Richard.
2011-10-18 17:11:05 -07:00
ae3b5a4907
* Fixed icon opacity on selected and unselected buttons
2011-10-17 15:15:40 -07:00
a2e32429bb
fix for not being able to drag disabled buttons
2011-10-17 13:42:35 -07:00
e653e924fe
Mac build fix
2011-10-17 09:25:07 -07:00
6d1ae4e0d6
wip on dragging disabled toolbar buttons
2011-10-16 23:37:55 -07:00
7c2f2b526a
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
2011-10-15 18:10:44 -07:00
0976964f83
EXP-1336 FIX Move Notifications to upper right
...
also made toolbar buttons not trigger if enabled callback returns false
2011-10-14 18:25:30 -07:00
4c6f04c502
EXP-1363 : Fix caret position in multiple lines or columns situation
2011-10-14 16:47:43 -07:00
1a9eaf09b0
EXP-1331 : Fix the drag to position 0 case I broke while fixing the drag on itself case... Aaagh...
2011-10-13 08:58:36 -07:00
303579309d
Pull from richard/viewer-experience-fui
2011-10-12 19:49:09 -07:00
c14aa1b64e
EXP-1331 : Avoid showing the caret if the tool is dragged over itself
2011-10-12 19:48:13 -07:00
86cbb16e27
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
2011-10-12 18:17:18 -07: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
40ebe180a6
Pull from richard/viewer-experience-fui
2011-10-12 18:13:01 -07:00
aa1f0215c7
EXP-1331 : Implement new longer caret and make it work on multi lines or columns of tools. EXP-1304 : handle only tools in DaD on toolbars
2011-10-12 18:01:50 -07:00
1181e7c757
Merge
2011-10-12 17:50:03 -07:00
20358ea89d
* Added mModified flag and isModified() query to check it.
...
(currently it is not connect to actual data)
2011-10-12 17:45:21 -07:00
d5d7e264ad
don't highlight toolbar buttons during drag and drop (for real)
2011-10-12 16:51:00 -07:00
3594853d0e
don't highlight toolbar buttons during drag and drop
...
added mVisibleWhenMinimized to floaters
2011-10-12 16:17:24 -07:00
dacfe7b2bd
EXP-1300 : Fix caret position in bottom bar, fix misplacement when moving within same toolbar, suppress visible caret in some situations, no caret if toolbar empty
2011-10-11 16:20:02 -07:00
682609d254
Pull from richard/viewer-experience-fui
2011-10-11 15:16:45 -07:00
3596c0f7e1
EXP-1300 : Implemented carets for DaD. Works with small bugs but OK for demo. Still in need of some cleanup
2011-10-11 15:06:16 -07:00
aec61c579a
Added 'execute_stop_function' command parameter to handle mouse down/up actions on toolbar buttons
2011-10-11 10:07:19 -07:00
8b5a905bdb
pull from richard/viewer-experience-fui
2011-10-10 18:22:56 -07:00
1478f22857
EXP-1300 : Simplify and clean up of the DaD which now doesn't duplicate the dragged tool.
2011-10-10 18:00:24 -07:00
6a570a9bdc
fixed icons moving when clicking on icon-only toolbars
2011-10-10 17:52:37 -07:00
ec5ea33c81
EXP-1300 : drop tool animation. First shot. Works but still a bit hacky and with some bugs (tools can be duplicated at times).
2011-10-09 15:52:45 -07:00
feabe29f35
EXP-1300 : Completed the drawing of drop zones on toolbars when dragging tools
2011-10-07 18:30:57 -07:00
ea02a6a80d
EXP-1301 : Init some members that were not initialized correctly
2011-10-06 17:14:54 -07:00
740b3547d6
EXP-1303 FIX Drag and dropping button over viewer area can select objects inworld
...
fixed close button not working on floaters against right edge of window
fixed drag and drop only working once per toolbar button
reimplemented drag and drop threshold
2011-10-06 16:48:19 -07:00
adeaf71e33
EXP-1300 WIP Visual feedback for Drag and Drop
...
removed hover highlighting of buttons when dragging over them
also updated toolbar button art to match spec
2011-10-06 15:19:15 -07:00
55d2e0020b
Merge!
2011-10-05 17:38:56 -07:00
64d005bfed
EXP-1286 : Add DaD to toybox
2011-10-05 17:04:07 -07:00
70495f6f2f
Fixing merge mistakes!
2011-10-05 16:56:49 -07:00
d848916664
Merge with latest
2011-10-05 16:39:32 -07:00
93e3c8e4a5
EXP-1280 FIX -- Minimized floaters associated with toolbar buttons should change the state of their parent button
...
* Toolbar buttons now display green when its corresponding floater is open or
minimized.
* Made changes to buttons so flash time and rate is configurable
* Removed unused "highlight_color" attribute from LLButton
* Implemented "isVisible" function for toolbar button floaters. It returns true
when the floater is visible or minimized.
* Toolbar floater unminimize now also puts focus to the floater
* All commands now specify their "is_running_function" for toolbar button state
* ButtonFlashCount and ButtonFlashRate have been moved to button.xml settings
and are now configurable on the button. Toolbar buttons are set to never
flash and this functionality is used to show which buttons have windows open.
* All toybox buttons show hover glow even when disabled
Reviewed by Richard.
2011-10-05 16:28:40 -07:00
00dc8b3982
EXP-1286 : DaD works between all toolbars, button drops in correct place, removal of button works too
2011-10-05 14:47:50 -07:00
Richard Linden