Commit Graph

98 Commits (b6253a7da4f7f7e265c3b1bc419317f548a81bac)

Author SHA1 Message Date
Ansariel 69f14e2f29 Initial merge of viewer-legacy-profiles
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
2019-07-19 11:21:54 +02:00
Kadah_Coba 0be2b5ce51 Corrected LLPanelIMControlPanel source file header info 2019-03-03 22:56:19 -08: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
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
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Ansariel 60d00ec339 CHUI preparation phase 2: Replace comm-related files with stock V3 files (if'ed out) 2013-03-01 12:37:48 +01:00
Ansariel 18124484c5 CHUI preparation phase 1 continued: Move FS-specific communication parts into a separate domain and out of the way for CHUI merge to reduce conflicts
* LLCallFloater moved to FSFloaterVoiceControls
* LLPanelIMControlPanel moved to FSPanelIMControlPanel
* floater_voice_controls.xml moved to floater_fs_voice_controls.xml
* panel_adhoc_control_panel.xml moved to panel_fs_adhoc_control_panel.xml
* panel_group_control_panel.xml moved to panel_fs_group_control_panel.xml
* panel_im_control_panel.xml moved to panel_fs_im_control_panel.xml
2013-03-01 11:32:01 +01:00
Seth ProductEngine bba0f4f74e CHUI-119 WIP 2012-05-31 16:37:22 +03:00
AlexanderP ProductEngine 0ed7966bd5 CHUI-105 WIP Remove obsolete controls from the group's control pane 2012-05-15 20:42:14 +03:00
AlexanderP ProductEngine c866b094ee CHUI-113 WIP clean-up (obsolete code was removed) 2012-05-14 21:19:18 +03:00
AlexanderP ProductEngine df58153514 CHUI-113 WIP all voice controls is moved from a IM-control panel to the IM floater;
IMControlPanel is removed;
simplified voice button's listener behavior
2012-05-14 15:44:57 +03:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Vadim ProductEngine 13d510d5f2 EXP-1847 FIXED Fixed inability to mute a nearby avatar in Voice Settings if the speakers list is sorted by name.
Added missing update of the floater's internal speaker list.
2012-01-27 19:31:52 +02:00
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
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
Leyla Farazha de1fe235c0 EXP-878 Volume slider shown at 0 2011-06-15 10:29:35 -07:00
Leyla Farazha 1361eeae4e merge 2011-06-07 17:16:49 -07:00
Leyla Farazha bff172b374 EXP-824 Adding volume slider and block btn in basic mode IM panel 2011-05-30 15:38:37 -07:00
Arrehn be4df3fac0 FIRE-2859, Additionally remove volume controls from groupchat slideout participant list. 2011-09-04 11:05:22 -04: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 b2ff2a7400 CRASH FIX: Make sure our IM windows clean up observers on close
Thanks Mindy, Tozh, and all patient others.

--HG--
branch : Firestorm_2.4.1
2011-01-27 13:25:19 -05:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Aimee Linden 0a74d15935 Merge between james/viewer-identity-evolution and dessie/viewer-public 2010-09-03 15:30:16 +01: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
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07:00
Vadim Savchuk 589619d8cc EXT-7304 Disable "Share", "Pay", "Call", etc buttons in IM window when viewer gets disconnected.
I haven't found a better way to do that than binding to focus received signal (borrowed the idea from the nearby chat input field implementation).

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/686/

--HG--
branch : product-engine
2010-07-02 16:46:25 +03:00
James Cook 8b52454990 merge pull from dessie/viewer-public, picking up SLE code 2010-05-13 15:47:32 -07: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
James Cook 18ebacefcf Merge with viewer 2 beta 4 2010-03-08 10:54:23 -08:00
Andrew Dyukov cb95fc1f48 No ticket. Replaced calls of LLVoiceClient::getInstance() to LLVoiceClient::instanceExists() in checks before
removal of voice client status observers. These checks were introduced in changeset bc6a6ab2ce54.

--HG--
branch : product-engine
2010-02-19 22:17:31 +02:00
Paul Guslisty pguslisty@productengine.com 0e035fd9b8 Fixed normal bug EXT - 5104 (Remove names from below Profile image in IM windows)
- removed LLTextBox containing avatar name from IM control panel(panel_im_control_panel.xml) and corresponding code in LLPanelIMControlPanel
2010-02-11 09:41:20 +02:00
James Cook 88350edbcb merge 2010-02-03 14:13:56 -08:00
Andrew Dyukov a1c3d60819 No ticket. Removed unrelevant comment and added disabling call button if session doesn't exist in LLPanelChatControlPanel::updateCallButton().
--HG--
branch : product-engine
2010-02-03 21:48:30 +02:00
Andrew Dyukov 5bcf9661c5 Fixed normal bug EXT-4796 (Linux only: Call Group button blinks while Group Chat).
- Removed updateCallButton() call from draw() and added it to LLIMFloater::sessionInitReplyReceived() to enable "Call" button when session is initialized.

--HG--
branch : product-engine
2010-02-03 16:48:15 +02:00
James Cook 146e9d5e4d Support returning full_name (and SLID) for LLCacheName::get() calls
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
2010-02-01 17:06:18 -08:00
Andrew Dyukov ab0c9c6754 Fixed normal bugs EXT-4450 ([BSI] call buttons enabled when voice is disabled) and EXT-4313
(Should not be able to start a call when voice is disabled). Call buttons state now reacts on
voice changes in time.

- Added voiceWorking() method to LLVoiceClient to determine real availability of voice, because voiceEnabled()
doesn't take into account possible errors. Perhaps there is no need in two methods- some investigation will be
made and depending on its results they may become one non-static method. voiceWorking() uses state of voice
client(mState) to determine voice availability. Also some states which are not currently counted by voiceWorking()
as valid may be added if testing reveals problems.

- To enable/disable call buttons in time, LLVoiceClientStatusObserver is used. Its trigger uses states from its
enum only to skip updating button in some states(to avoid button blinking), but to determine button state
LLVoiceClient's voiceWorking() is used.

--HG--
branch : product-engine
2010-01-22 22:16:57 +02:00
Mike Antipov 7b41de5fac Work on normal task EXT-2214 Refactor IM Control Panels
-- removed reference to LLSpeakerMgr from LLPanelGroupControlPanel (group text chat)

--HG--
branch : product-engine
2010-01-22 15:16:53 +02:00
Mike Antipov 1a8325f4dc Work on normal task EXT-2214 Refactor IM Control Panels
-- replaced functionality to remove speacker from the list via Event timer.
-- removed calling of LLSpeakerMgr::update from LLPanelGroupControlPanel::draw() (group text chat)
	For now list is updated when it is need.

--HG--
branch : product-engine
2010-01-22 14:59:12 +02:00
Mike Antipov 7f61cde331 Reducing include dependence from the "llspeakers.h" through "llimview.h" (following by the 7d600b529ee8 commit)
--HG--
branch : product-engine
2010-01-20 23:28:57 +02:00
Igor Borovkov a656e7bbfd fixed EXT-3886 Group Profile button does not always show group info
--HG--
branch : product-engine
2010-01-14 16:38:44 +02:00
Vadim Savchuk babc73682d Fixed bug EXT-3750 (IM window min size too large):
* Decreased minimum IM window size.
 * Removed gaps between buttons on the left.

--HG--
branch : product-engine
2010-01-05 19:38:34 +02:00
Andrew Dyukov 9737349a72 Fixed minor bug EXT-2955 ("Teleport" button is enabled in profile panel of offline avatar).
- Fixed not only "Teleport" button from profile, but also from IM (according to comment in JIRA).

--HG--
branch : product-engine
2009-12-29 19:55:23 +02:00