Commit Graph

49 Commits (2bc4fb2bf0bef5adf709ef1fc90ba1bcdee7f8d0)

Author SHA1 Message Date
Ansariel fca3d46302 Fix XUI parser warning 2018-01-20 13:05:20 +01:00
Ansariel 6b983c8a76 Get rid of hardcoded downstream dependency in LLMultiFloater 2018-01-17 11:00:44 +01:00
Ansariel 38171944dc FIRE-5459 / FIRE-5686: Fix for torn-off IM floaters jumping when clicking on IM chiclets and floaters not persisting positions 2018-01-16 20:03:41 +01:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 3659e91bbb Fix attribution for 55799d8f7b99, cf9e0847adcc and 8882db725f44 that were originally done by Drake Arconis (Sovereign Engineer) 2014-08-29 08:42:14 +02:00
Ansariel 4f7cac1d40 Use dynamic cast instead of c-style cast in LLMultiFloater; found by Cinder Roxley 2014-08-26 20:42:38 +02:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Ansariel 55aa33ae20 FIRE-13129: Ctrl + Shift + W will not close communications floater if an IM tab is open 2014-03-14 09:59:11 +01:00
Ansariel cad57f1e23 FIRE-10908: CTRL-W closes multifloater instead of active child floater 2014-03-08 14:08:56 +01:00
Richard Linden 6ddfc8031c BUILDFIX - miscellaneous stuff missed in the merge 2013-11-12 11:42:06 -08:00
Ansariel 92cc46cbc8 FIRE-11788: Opening multiple textures simultaneously fails 2014-01-27 13:44:12 +01:00
Ansariel 4270230083 FIRE-3768: Fixed tear off and close buttons in multi floater overlapping content 2014-01-27 10:01:38 +01:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Ansariel 2f688b41d6 Re-apply hosted floater header improvements 2013-06-30 23:24:36 +02:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Merov Linden 2e31138630 CHUI-672 : Fixed : LLMultiFloater members need to be initialized in constructor. 2013-01-10 20:19:26 -08:00
AlexanderP ProductEngine 118201943d CHUI-643 FIXED Collapsed conversations floater has huge right padding: prevent of a rewriting mOriginMinWidth and mOriginMinHeight to default values 2013-01-04 23:54:38 +02:00
maksymsproductengine 01bdfb3ecb CHUI-591 FIXED Issues with resizing conversations floater 2012-12-15 21:28:38 +02:00
AlexanderP ProductEngine 0fa1e2b9ae CHUI-230, CHUI-232, CHUI-261 Forced resize of a conversation's floater in the IM-container; support of the rectControls for IM-conversations; fixed LLFloater and LLMultiFloater for the correct hosting of floaters with mSaveRect 2012-08-02 18:43:44 +03:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Ansariel cabac0cad7 Cleared remaining merge issues from FUI merge: We don't need to call floaterp->setTornOff() in llmultifloater.cpp to set the tear off state - this is done in LLFloater::setTornOff() based on Catznip already 2012-12-25 15:05:49 +01:00
Merov Linden b64fc84707 CHUI-145 : WIP Always open the message pane when clicking on a conversation in the list 2012-06-18 08:21:42 -07:00
Seth ProductEngine f59aa88039 CHUI-105 WIP Implemented collapsed/expanded state transitions for messages and conversation panes.
The states and dimensions of Conversations floater panes are saved in per account settings.
2012-05-17 02:51:18 +03:00
Paul ProductEngine fc95597c63 MAINT-405 FIXED ([PUBLIC]Ctrl W does not properly close IM tabs using tabbed IM in 2.x/3.x)
- Now tabs are closed with Ctrl+W as expected
2012-03-28 21:19:33 +03:00
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
ziree 72669f4475 Fixed edge case where hosted floates changed size on tear-off if user logged out inbetween. 2012-02-10 16:01:54 +01:00
ZiRee b1e5b63aef Moved responsibility of title hiding to LLMultiFloater, fixes various title issues in hosted floaters. Fixed hosted floaters not tearing off at first try. 2012-02-09 13:31:50 +01:00
ZiRee 58a9550b9e Fixed multi floater tear-off and hosting (nearby chat, tabbed IM floaters) 2012-02-09 02:37:21 +01:00
Nicky 6958381112 Merge up to 26092/6ceebf5ce17b; Branch Chat-NearbyChat from catznip-3.2.0 (http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0).
This will enable chat docking/undocking from contacts floater again.
2012-01-23 14:56:47 +01:00
Nicky 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
Tonya Souther b25e2b9493 Don't update floater title if the tab we're updating isn't the active tab. 2011-11-01 19:03:22 -05:00
Tonya Souther 212f41e0a1 Update the overall floater title when a tab title in a multifloater is updated. Fixes FIRE-3778. 2011-11-01 09:56:34 -05:00
Arrehn dac16f4b49 FIRE-3665, Allow smaller conversations floaters, by Satomi Ahn 2011-10-29 12:36:54 -04:00
Arrehn bb7e2458b3 FIRE-3651, Windows hosted in contacts floater share titlebar, by Satomi Ahn 2011-10-29 11:45:02 -04:00
Arrehn abd3d31771 Horizontal Tabs now a chat option. GUI-switchable feature by Tozh Taurog & Arrehn 2010-12-22 01:29:24 -05:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson a1f21c968e EXT-7700 - Script error window shows [All Scripts] for every tab
reviewed by Mani
2010-06-07 16:49:06 -07:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
Vadim Savchuk 0f620c1001 Fixed bug EXT-5695 (Tabbed IM window loses focus if close any tab by Ctrl+W)
Submitting on behalf of Paul Guslisty.

Reviewed by Mike: https://codereview.productengine.com/secondlife/r/66/

--HG--
branch : product-engine
2010-03-19 20:53:38 +02:00
Paul Guslisty 93bd065356 Fixed normal bug EXT - 3835 ([BSI] tabs in instant message floater should never change sizes)
--HG--
branch : product-engine
2010-02-08 15:21:24 +02:00
Rick Pasetto c54faf2823 Fix crash in LLMultiFloater::setCanResize()
Reviewed (conceptually) by Richard and James
2009-10-30 16:01:58 -07:00
James Cook 432e243e1a EXT-1352 Add image art to floater backgrounds.
Implemented "legacy_header_height" hack to account for new art being 25 pixels
tall instead of legacy 18 pixels -- it auto-sizes the floaters to be taller.
Made all floaters have resize handles, just disable and make invisible if unused.
This simplifies the floater construction logic.  Floater header height now lives
in floater.xml, not as a global saved setting.  Reviewed with Richard.
2009-10-29 15:37:25 -07:00
Richard Nelson 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
Richard Nelson 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
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 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