92e7843fcf
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/lltabcontainer.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/lllogininstance.cpp
# indra/newview/llmodelpreview.cpp
2020-04-25 17:26:59 +02:00
a0e91e9e50
SL-307 Improvements to flashing color
2020-04-24 18:05:14 +03:00
e0cd97f865
Merge branch 'DRTVWR-482' of https://bitbucket.org/lindenlab/viewer
2020-04-01 12:11:22 +02:00
eaa9b152bf
SL-307 Implemented ability to specify color and changed flashing color
2020-03-27 22:38:15 +02:00
a63693b454
Merge mesh upload changes
2019-05-11 13:12:11 +02:00
93f0023efa
Merged in lindenlab/viewer-release
2019-05-08 21:41:11 +03:00
580b35c8ea
SL-307 Display in-viewer all warning messages logged by the mesh uploader
2019-04-01 20:22:25 +03:00
dd2636a2c2
Merge viewer-neko
2019-01-10 21:10:36 +01:00
09b750483a
SL-10293 Firestorm PR: preferences and menu search
2019-01-03 22:59:49 +02:00
dd69a22834
Merge viewer-bear
2017-01-27 09:42:51 +01:00
f5e1ba26b7
MAINT-6899 Viewer should use fixed buttons instead of a scroll list for tabs in Appearance floater
2016-12-14 17:24:26 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
79295f6a34
FIRE-2778: Allow re-arranging IM tabs; by Kitty Barnett (Catznip Viewer), with modifications for Firestorm
2015-07-13 16:08:57 +02:00
ab7d3956f1
Remove remainders of oprhaned and obsolete UI-TabDndButtonCommit patch; use "open_tabs_on_drag_and_drop"
2015-07-13 13:12:41 +02:00
4ce6691cf8
Merge viewer-xp_tools
2015-06-25 11:57:17 +02:00
b54983b605
Allow preferences to be searched.
2014-09-28 03:00:57 +02:00
7c3e51b05c
Merge with 3.7.0
2014-02-12 14:31:37 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
fa50f999fd
Show voice channel state indicator in correct color if tab is selected
2014-02-04 19:33:52 +01:00
ba5bfa3f83
FIRE-4849: Add voice status icon to chat tabs in conversations floater
2014-02-03 21:47:50 +01:00
52ec6f9af0
remove excessively complex fixes for MAINT-2914 and MAINT-3142
2013-11-26 15:09:55 -05:00
93b1111507
Merge with viewer-bear
2013-10-22 13:40:52 -07:00
1aed2f848c
Added LLTabContainer::getTotalTabWidth
...
Cleaned up experience profile floater
2013-10-15 16:42:55 -07:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
48f702029f
MAINT-2914 FIXED Mousing over UI elements does not make them light up
2013-08-02 18:00:08 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
c4f80e4d86
Backed out changeset: 42628030c262
2013-04-08 08:40:18 -07:00
cf3ed870c3
Add proper scrolling to vertical tab
2013-03-15 21:28:37 -07:00
ffe8081806
CHUI 571: Code review changes, now LLFloaterIMContainer::showStub inlines code for hiding all tab panels and then showing the stub panel. Before the function would call hideAllTabs()
2012-12-05 12:40:44 -08:00
2813e49d19
CHUI-362 WIP (Torn off conversation name is highlighted when selected in conversation list with different conversation showing in message panel): implemented method for a switch off tabs (switching to an invisible state)
2012-11-09 15:13:52 +02:00
a2b20e69ed
FIRE-8024 Ability to scroll tab containers with the scroll wheel on the mouse
2012-10-22 10:29:06 -07:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
6e72afbcfa
Oops ... backed out unfinished testing code.
2012-01-13 22:36:00 +01:00
5856318a3b
Sliders are more V1 like in Vintage now.
2012-01-13 22:31:22 +01:00
3272b527e8
Support optional drop shadows on tab labels.
2012-01-10 21:36:39 +01:00
4afb450225
EXP-1504 : Move the tab opening stuff to lltabcontainer and out of llbutton. Added an xui param to allow drill through tabs. Set that param for build panel only.
2011-11-11 09:31:07 -08:00
4e59256bdf
- added : configurable "tab_drag_commit" option for tab controls
...
-> reasoning: dragging an inventory item over the preferences floaters will activate the individual tabs even though the behaviour doesn't make sense there
2011-06-17 01:24:27 +02:00
3b7c0d52d9
- changed : removed the custom LLTabContainer drag-and-hold code in LLPanelMainInventory
...
-> note: this code will change the auto-scroll rectangle for the active inventory panel as a side-effect
2011-06-17 00:31:57 +02:00
ef59beb300
- fixed : drag-and-hold doesn't activate tab buttons on the build floater
2011-06-16 23:02:25 +02:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
66ddb437f1
EXT-7087 FIXED Added flashing icons for im tabs and hooked them up in code
...
Added new attribute image_flash to button.xml which sets an image used for button icon when button is flashing.
Pointer to this image is stored in member mImageFlash from LLButton and is used in LLButton::draw(). There are two
ways an image can flash now - by making changes in color according to flash_color attribute or by changing icon from
current to the one specified in image_flash. Second way is used only if the name of flash icon is different from
"FlashIconAbsent" which is there by default. First way is used otherwise. Used new selfmade orange icons for
flashing tabs.
--HG--
branch : product-engine
2010-05-31 22:30:35 +03:00
e788930172
Fixed normal bug EXT - 4878 (Tab labels are no longer obeying halign attribute)
...
--HG--
branch : product-engine
2010-02-09 10:06:52 +02:00
b79b8f87a3
finished with EXT-2753 - Implement Avatar icons on IM multifloater tabs
...
add floater flashing, fix group icon sizes, fix click,some code cleanup, ect.
also I remove mIconCtrlWidth/Height since its kinda useless - mIconCtrlPad do the same thing...
IconSize will be btn_height-2*mIconCtrlPad - simple and good enough.
--HG--
branch : product-engine
2010-02-05 13:03:26 +02:00
bc5ad04d61
applying patch for EXT-2357
...
--HG--
branch : product-engine
2010-02-05 09:41:54 +02:00
8ea2c7a373
Implemeted normal Sub-Task EXT - 2753 (Implement Avatar icons on IM multifloater tabs)
...
--HG--
branch : product-engine
2010-01-27 14:16:37 +02:00
0fd17c8d2d
Implemeted normal Sub-task EXT - 2753 (Implement Avatar icons on IM multifloater tabs). Some code needs improvements(refactoring, optimization)
...
--HG--
branch : product-engine
2010-01-21 21:11:59 +02:00
87ef5c2472
EXT-3471 Tabs need a pad_bottom override attribute
...
Added label_pad_bottom and label_pad_left for tab containers.
2009-12-15 09:54:50 -08:00
Ansariel