Commit Graph

102 Commits (0b3756aeab22656fd13fa9ccdda0397561ba4ca3)

Author SHA1 Message Date
Nicky 1714747536 After merge compare FS tree agsindt V/dev.
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +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
Richard Linden 6293746b59 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge 2011-11-26 21:21:56 -08:00
Richard Linden b6858df0dd LLHandle<Derived> is now implicitly convertable to LLHandle<Base> and LLHandle<Base>
can be downcast to LLHandle<Derived> using the LLHandleProvider mixin
2011-11-08 13:47:08 -08:00
Richard Linden a507fc259b finished removing remnants of media browser 2011-11-07 15:04:53 -08:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Paul ProductEngine 679a028fcc EXP-1203 ADDITIONAL FIX (As a FUI user, I want the address bar and favorites to be on one line)
- Removed search combobox by spec

- Fixed EXP-1243 (Parcel characteristics icons from location bar overlay other ui elements)

- Fixed EXP-1245 (More spillover list "jumps" on copying landmarks)
2011-09-26 20:37:02 +03:00
Paul ProductEngine 5baf0de6a3 EXP-1203 FIXED (As a FUI user, I want the address bar and favorites to be on one line)
- Relocated address bar, combined with favorite landmarks EXP-1208
- Added dragger to change amount of space allocated to address bar and favorites bar EXP-1217
- Modified Favorites ->> More spillover EXP-1218
- Combined context menu menuitems for favorites & address bars  EXP-1219
2011-09-19 19:13:39 +03:00
Richard Linden fa3f4d1166 EXP-880 FIX Enable navigation chrome for Search floater
search floater derives from floater_web_content
all web content now uses floater_web_content instead of media_browser
2011-07-12 20:58:30 -07:00
Richard Linden f443f3e847 SOCIAL-717 FIX Artwork for click to move hint
updated resize logic for hint popups to accomodate image size
2011-03-25 19:13:32 -07:00
Richard Linden 5e0b45ad6c SOCIAL-629 FIX Search Floater accessible from typing a search term in location bar 2011-03-03 19:52:21 -08:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Arrehn 71af67a25d FIRE-285 - Rewrote toppanel layouts to not cover huds, be more dynamic 2011-03-14 00:46:13 -04:00
Arrehn 8d7da67e82 Rewiring the topnav / favourites bars again to be compatible with starlight skins.
Still a hack - needs more work and polishing.

--HG--
branch : Firestorm_2.4.1
2011-01-30 19:10:52 -05:00
Arrehn bc240368ea Changing minimize offset mechanism to work around a linux build error. 2011-01-10 23:49:28 -05:00
Kadah 3fb5cbf834 Added location info to menu/status bar (LGPL) 2011-01-09 16:40:20 -08:00
Arrehn 3daaf8d18e Make iconified windows respect the space taken by the topbars and not overlap 2011-01-09 03:27:16 -05:00
Arrehn e4d1ffaddf Najor top bar rewiring. Topbars now float over world. Search field toggleable. All bars toggleable. 2010-12-27 00:27:30 -05:00
Richard Linden 67be46c78a made mIsFocusRoot a XUI param 2010-09-28 17:12:50 -07:00
Monroe Linden b62b10dd26 Post-convert merge by convert_monolith.py from ./viewer-experience 2010-08-27 16:58:33 -07:00
Richard Nelson 02d8197019 changed buildPanel/buildFloater to member functions buildFromFile
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
Richard Nelson c20bd2dfee cleaned up LLUICtrlFactory...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 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
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Richard Nelson 566e3969f9 deprecated LLPanel::child*() methods 2010-07-30 10:02:30 -07:00
Andrew Polunin 3e7af3244f EXT-7536 FIXED (Favorites bar and Navigation bar looks similar to the mock-up)
- Added constant FAVBAR_TOP_PADDING in the LLNavigationBar which defines the distance between navigation panel and favorites panel in pixels.
- Added new image NavBar_BG_NoFav_Bevel which is used to show navigation panel with favorites bar hidden. It is required to show navigation panel with bevel at the bottom.
- Added new image NavBar_BG_NoNav_Bevel which is used to show favorites panel with navigation panel hidden. It is required to show favorites panel with bevel at the top.
- Removed image NavBar_BG_NoFav. It is not used anymore.
- Modified the methods showNavigationPanel and showFavoritesPanel to take into account that distance.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/664/

--HG--
branch : product-engine
2010-07-06 17:30:20 +03:00
Andrew Polunin 5609f78f45 EXT-5808 FIXED Mini-Location panel was added below Navigation Bar
- Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class.
- Mini-Location panel is turned off by default.
- Added top bar context menu option \"Show Mini-Location Panel\".
- Mini-Location panel displays the same context menu as top bar.
- Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp.
- Added declaration of the widget in main_view.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/

--HG--
branch : product-engine
2010-06-03 18:59:16 +03:00
Yuri Chebotarev 0473ab08d8 EXT-7034 FIX add initializationagent position at later state in case initialization at earlier state failed.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/480/

--HG--
branch : product-engine
2010-06-02 18:21:25 +03:00
Roxie Linden a11ec0c89f Automated merge 2010-05-04 16:09:14 -07:00
Vadim Savchuk 07b463722e Fixed bug EXT-6798 (Crash in LLTeleportHistoryStorage).
Reason: Attempt to purge empty teleport history resulted in inconsistent history state.
There were two consequences:
1) Further teleports would not properly update the history.
2) Subscribers of history changes were notified of the invalid change and that led to the crash.

My changes:
- added a sanity check to LLTeleportHistoryStorage::onTeleportHistoryChange() to prevent the crash
- purging empty teleport history now does nothing, hence the history doesn't become inconsistent
- removed a redundant (but harmless) call to onTeleportHistoryChanged() from LLNavigationBar::draw() because it's called by LLTeleportHistory::purgeItems() anyway

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

--HG--
branch : product-engine
2010-04-23 17:18:37 +03:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden 1147cb1afb Automated merge from trunk 2010-03-01 18:09:04 -08:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden 5352954eb6 automated merge 2010-02-26 17:34:39 -08:00
Roxie Linden 13d4257868 automated merge 2010-02-26 12:02:34 -08:00
Denis Serdjuk e235e71b90 Bug Low EXT-5194 SLURL field dropdown should display empty menu rather than do nothing when empty
Solution:
Button of dropdown list will be disabled if there are no items in location history

--HG--
branch : product-engine
2010-02-25 19:15:59 +02:00
Denis Serdjuk 6a3ea6fa61 no ticket. minor changes. Comments cleaning up. The logic was NOT changed.
--HG--
branch : product-engine
2010-02-19 18:47:21 +02:00
Denis Serdjuk c8cc2f4cb8 fixed normal Bug EXT-5380 'Place Profile' side panel opens instead 'Search' floater after not-recognized SLURL was entered in Location Field
--HG--
branch : product-engine
2010-02-19 17:50:13 +02:00
Denis Serdjuk 7b62c80060 Additional commit for low Bug EXT-4242 . No logic had been affected. code cleaning up.
--HG--
branch : product-engine
2010-02-04 15:58:49 +02:00
Denis Serdjuk df7292b716 fixed low Bug EXT-4242 History Dropdown should appear immediately when click-dragging downward from back button
LLPullButton has been implemented to handle such behavior

--HG--
branch : product-engine
2010-02-02 21:38:36 +02:00
Denis Serdjuk 27c08cec25 fixed bug EXT-4241 Back button in nav bar should remain depressed during click-hold
Cause:
mouse capture was reset by the popup menu. It broke  mouse event workflow and made invalid changing of pressed state.
Solution:
Workaround with mouseUp callback of gMenuHolder has been implemented to handle mouseUp event and to change pressed state of the buttons.

--HG--
branch : product-engine
2010-02-02 21:03:04 +02:00
Lynx Linden bf7494017f EXT-3486: Support SLapps and URLs in the nav bar.
If the user enters a string into the navigation bar that is not
recognized as an SL location, the behavior is now:

- handle any secondlife:// SLapps, or
- open any http: or https: URLs in the media browser, or
- otherwise, send the text to the search floater
2009-12-21 15:49:52 +00:00
Denis Serdjuk fdf9f9d779 EXT-3352 Unable to chat from mouselook mode
Cause :
After changes in layout  in  main_view.xml, navbar had received another parent, but setVisible had used getParent() to control visibility of the navbar

--HG--
branch : product-engine
2009-12-14 18:30:13 +02:00
brad kittenbrink cb9b874b17 Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0. 2009-12-14 11:07:29 -08:00
James Cook e9bca5d52a EXT-2980 Remove indentation on back button history list.
Design reviewed with Lis
2009-12-09 13:02:51 -08:00