Commit Graph

91 Commits (ec5dbb60e71302a77f68cc604e7dfd52bcaa926a)

Author SHA1 Message Date
Tofu Linden 471b8f71cd Merge conflict resolution. 2010-01-25 11:00:46 -08:00
Rick Pasetto af83fe79d8 "Fix" confusion over media settings
Review #89

This implements the changes Sam wanted in order to reduce the confusion over media enabled-ness, in particular:
- "Media Enabled" pref now only controls "AudioStreamingMedia"
- No more "tentative" state
- New "Music Enabled" pref
- First run dialog controls Media and Music (Sam, this is a change from your request...I think it works better)
- Put a reflection of the "Media Enabled" checkbox in the Nearby Media Floater
- Get rid of the "AudioStreamingVideo" setting altogether (whatever used it, it should now obey "AudioStreamingMedia").
2010-01-25 10:04:56 -08:00
Igor Borovkov c4cb6628b9 fixed linux build
--HG--
branch : product-engine
2010-01-25 17:50:19 +02:00
Igor Borovkov 307d94a92a implemented EXT-4131 [BSI] "Only friends and groups can call or IM me" NEEDS auto-response
added a modal warning window
"Non-friends won't know that you've choosen to ignore their calls and instant messages."

--HG--
branch : product-engine
2010-01-25 17:20:09 +02:00
Rick Pasetto 3a707a1a69 Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/ 2010-01-15 12:05:24 -08:00
Rick Pasetto 315c381d80 FIX EXT-3957: add "Media Enabled" checkbox to Privacy Prefs
review http://codereview.lindenlab.com/271074
2010-01-15 12:01:57 -08:00
angela 6a2b10d869 clean up LLFrstUse and it's notification but leave OverideKeys and Sandbox intact -- reviewed by james 2010-01-14 11:40:24 +08:00
angela 433eb89473 EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc) 2010-01-14 09:38:46 +08:00
angela@angelas-macbook-pro.local 2b2579cf1e EXT-1645 [BSI] Selection Beam color preference (My Effects) isn't remembered after re-log EXT-1644 [BSI] Selection Beam color preference (My Effects) doesn't honor color choice -- reviewed by richard 2010-01-12 11:03:28 +08:00
Tofu Linden bffbd93b06 DEV-44804 autoplay preference for media should enable the media subsystem when toggled from off to on 2010-01-06 15:16:12 -08:00
James Cook b3d0c94ee0 EXT-3720 Added Advanced > Set Window Size... for video making
Torley needed this to make tutorial movies.
Removed dead code from Preferences.
Reviewed by Leyla.
2009-12-29 16:23:49 -08:00
Leyla Farazha 9538f96613 EXT-3523 Missing God Mode functions in User Profile
EXT-2635 	 No message reminding user that a restart is required to reset cache (was Clear Cache)
reviewed by Richard
2009-12-21 15:33:06 -08:00
Leyla Farazha 94a86f13b6 removing mCancelOnClose 2009-12-17 16:25:33 -08:00
Leyla Farazha 43ed40f976 merge 2009-12-17 16:23:29 -08:00
Leyla Farazha ab93c0ffb5 EXT-3534 Default Location Obscures the Top of an Open Notecard When Nav and/or Favorites Bar are Hidden
EXT-3334 	 [BSI] Chat/IM log preferences not retained
EXT-3402 	 Replace "X" for checked menu items with a check mark glyph [Patch Included]
reviewed by richard
2009-12-17 16:15:46 -08:00
Dmitry Zaporozhan 40fa036891 Fix for normal bug EXT-3465 - Any changes made in Preferences floater are canceled after viewer shutdown.
--HG--
branch : product-engine
2009-12-15 16:18:26 +02:00
James Cook ae493ad72f EXT-3118 disabled Alerts appear to be enabled in Preferences
Wasn't rebuilding the list of alerts on Preferences open
Cleaned up some formatting in llfloaterpreference.cpp
2009-12-08 16:13:48 -08:00
James Cook 11ffb356cf Fix the build - merge missed an include file 2009-12-02 17:12:23 -08:00
James Cook 6684da77ca Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2009-12-02 16:22:01 -08:00
Leyla Farazha dee4849616 EXT-2635 No message reminding user that a restart is required to reset cache (was Clear Cache)
EXT-2652 	 Favorites bar drop-down button (for when favorites exceed width of viewer) is not configurable via XUI
EXT-2227 	 [BSI] Preferences -> Setup -> Cache Location blank
EXT-1036 	 Clicking menu separators selects wrong menu option (allows selection of greyed-out option)
reviewed by James
2009-12-01 11:26:43 -08:00
Yuri Chebotarev 9e0e0e4d54 no ticket. addition to "(EXT-2894)- Add support for the viewer 1.23 chat history style (widget-less)"
change all messages style when chaning chat style in preference.

--HG--
branch : product-engine
2009-11-30 15:35:48 +02:00
James Cook cbc0783cd1 Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
James Cook 458430be91 Removed include llnotifications.h from llfloater.h trying to speed builds
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
Steve Bennetts 8de68b4a58 Merge from product-engine 2009-11-23 20:11:02 -08:00
Sergey Borushevsky 9e403da7b0 Implemented major sub-task EXT-2517 (Add support for the viewer 1.23 chat history style (widget-less))
--HG--
branch : product-engine
2009-11-23 20:34:06 +02:00
Rick Pasetto a1dd97507c DEV-42967: Fix prefs panel to not clobber changes to prefs made by other UI
The prefs floater was unilaterally reverting any changes
made by other UI.  This fixes that by making squirreling
away the current settings an explicit operation, and
cancel now happens explicitly on close(), but only if
a flag is not set (as is what happens when you hit OK).

Reviewed by James.
2009-11-23 10:08:35 -08:00
Steve Bennetts 884a9887a7 Changes to IM Logging, includes preference changes 2009-11-18 21:42:27 -08:00
angela 33e1cae5cc Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/ 2009-11-11 07:08:13 +08:00
James Cook 0f6242d9fd Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
angela 26d481f385 (EXT-2343) Preference > Chat > ColorSwatch 's LLUIColorTable is not working 2009-11-10 22:49:25 +08:00
Lynx Linden eff50b018c merged 2009-11-03 10:43:13 +00:00
Lynx Linden 077025fa1e DEV-39999: Removed all legacy help buttons and notifications from the
code. All help should now go through the new help server, via the Help
Browser floater. There should no longer be any custom "?" buttons in
the UI - all <button> and <notification> XUI references relating to
custom help buttons have been expunged.

(I previously extracted all of the help strings from notifications.xml
and passed these to the doc team to include in the help server pages.)

I have checked that none of the XUI elements that are removed here are
still referenced by any C++ code. I've also confirmed that there are
no new notifications removed that I have not already passed on to the
doc team. And I've also done a pass through the UI to make sure that
all of the floaters still look as they should. Finally, I've confirmed
that the new help system for floaters and side panels still works.

2,276 lines deleted - 0 lines added.
2009-11-03 10:28:57 +00:00
Leyla Farazha 43c5ab0be2 EXT-1744 1-click Sit object not spawning an object inspector
EXT-1810   	 Right clicking own avatar displayed semi-transparent menus
EXT-1927   	 Hook up Push-to-talk in Preferences > Advanced
reviewed by richard
2009-11-02 14:11:07 -08:00
Palmer 5274c09b8f Fix for EXT-1812 - reflection radio boxes all selected
Reviewed by Richard
2009-10-27 17:35:04 -07:00
James Cook ec84b639ed EXT-1339 Create onClose method in LLFloater, and remove most bindings to mCloseSignal. In the vast majority of cases, mCloseSignal is being bound to an onClose function. Just make it virtual and be done with it. Renamed a couple of LLPanel close methods to onClosePanel() to distinguish them. Reviewed with Richard. 2009-10-07 20:54:31 +00:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
Steven Bennetts 606b381c9f merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180

* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator

QA NOTES:
* Message Well Window  is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
2009-09-29 19:37:05 +00:00
Jiao Li 760adead96 EXT-1006 Name Tag options not remembered in the Preferences window -- to be reviewed 2009-09-22 04:30:11 +00:00
Jiao Li 34b00eeda2 EXT-1015 terrain detail text not grayed out -- to be reviewed 2009-09-22 04:05:44 +00:00
Jiao Li f932678494 EXT-804 Preferences > General does not show the static text, or combo_box for Maturity rating -- to be reviewed 2009-09-15 09:24:35 +00:00
Jiao Li b6c716e50f EXT-804 Preferences > General does not show the static text, or combo_box for Maturity rating -- to be reviewed 2009-09-14 06:45:55 +00:00
Martin Reddy 58a2ba9581 DEV-39441: Removed include for boost/regex.hpp from llstring.h (and
fixed up viewer files that relied on this being included for them).
Also changed LLStringUtil::getSubstitution() to be a private method.

Reviewed by steve.
2009-09-09 11:54:23 +00:00
Steven Bennetts 79653dfed4 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 -> viewer-2.0.0-3
* Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790
* New Dev: EXT-694 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788
* EXT-272 - Draggable Landmarks
* EXT-715 - Block List Panel
* EXT-782 - Implement advanced place information accordions
2009-09-07 22:55:07 +00:00
James Cook eda3831041 skinning-22 -> viewer-2 trunk to pick up bug fixes, including crash on script compile when cursor is at the end of the script editor window. Replaced panel_pick_info.xml and panel_profile_view.xml with our versions, which stomped some PE changes. Panels still work, however, and Kurt is still working on layout.
CHANGES:
minor layout change: "start location" and "remember password" weren't on the same horizontal line.

DEV-35120 image_unselected art was "transparent.j2c" - switched it out for PushButton_Off

I18N: more things are missing a.. you guessed it, a name= parameter. Breaks localization.

forgot to check this in earlier...fixes off-by-one crash when editing a script

DEV-36740 change the displayed string per Erica's request re 'You can only set your Home Location...'  VIEWER-SIDE text change.  This does not change the actual message coming from the server

EXT-689 Odd spinner behaviour - For Sale Price -- reviewed by james

DEV-26973 Internationalize the server msg Youcan'tset this place as home -- reviewed by james

EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- reviewed by james

EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- to be reviewed

EXT-655 Cannot choose Both logging options in Preferences -- to be reviewed

Changes to notifications.xml text to fit Style Guide and some renamed menu items

EXT-147 Ongoing revisions to new gestures layout.

DEV-35097 catch more instances of 'SLURL' and make them 'SLurl'

Removed Info Displays and Buy Currency Test from top menus.

Clean up code to use proper childGetFoo and childSetFoo calls, as well as setCommitCallback using slots.

De-inlined LLAvatarIconCtrl paramblock constructor because I was doing a full rebuild anyhow.

Commented about use of childSetCommitCallback().  De-inlined LocalizedString paramblock constructor.

eliminated memory leak

I18N: more things are missing a name= parameter, breaks localization.

EXT-714 Updated panels in sidetray that were not using the scroll_container element to adjust for viewer heights.

fix for llmessage_test crash in Windows Release builds

DEV-11254 I18N: replace all string instances of "Second Life" - do this in the foreign languages too

DEV-11254 I18N: replace all string instances of "Second Life" - found new instances from merged code

potential fix for unit test crash on parabuild, moved statics into singleton member variables to get around potential dual instantation of statics on different modules

DEV-36809 Click target for slider handles is too small -- reviewed by steve

EXT-403 change getChild<LLSpiner> to LLUICtrl to make it generic -- reviewed by richard

DEV-35938 Horizontal scroll thumb too high -- to be reviewed

EXT-386 clean up warnings - initCommitCallback...

Rename Product Engine's LLFloaterMiniInspector to LLInspectAvatar, clean up XUI XML, clean up construction code, move refresh method to postBuild() so widgets are constructed before refresh, fixed a member variable in llavatarlistitem.cpp.  Reviewed with Leyla.

Login menu > Debug > Avatar Inspector shows test avatar inspector.  Also added to main menu > Debug > XUI > Avatar Inspector.  Changed text/layout of dummy inspector.  Not reviewed.

Merging revisions 131558-131975 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 into D:\viewer-2.0.0-3, respecting ancestry
2009-08-28 16:51:34 +00:00
Steven Bennetts 9e2cb2f4a0 DEV-38942 Eliminate startModal() from LLModalDialog
Also moved TOS and Critical floaters to login debug menu for testing
2009-08-28 08:04:26 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00: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
Leyla Farazha 06b079a24b EXT-580 Add Friend button in the IM floater not disabled if already friends
EXT-579 Add Friend from the Im floater opens multiple invitation dialogs
sidebar should be up above bottom tray
reviewed by richard
2009-08-20 00:21:14 +00:00
Steven Bennetts 8d7e56f219 Fixed bogus "changed skin" notification when closing preferences. 2009-08-11 07:34:17 +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