Commit Graph

43 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Andrew Dyukov ae43801f44 EXT-6655 Fixed Made the default busy message repsonse localizable with already existing account settings
- The root of busy response problem is that this text is located in non-localizable xml and, to make things worse, may be changed by user. So usual translation approach is little help here. So busy response was set the following way(EXT-5885)- on first run, string was written there from strings xml and was never changed later without direct user actions. So after changin locale message always remained the same.

- To make this string localize each time locale is changed and if it is the same as default message, new setting was added- BusyResponseChanged which is TRUE if user's busy message differ's from default. If it is true, we do nothing when locale changes, otherwise we set default message from current locale as user's busy message.

- Old transitional code from DEV-24146 was removed in this diff including unnecessary "BusyModeResponse2" setting(it is not needed because we'll anyway have to set busy message to default after first run of viewer after this fix and now busy response will be stored in "BusyModeResponse").

Warning! If user modified busy response message before this fix, it will be reset to default after first postfix run.

Reviewed by Richard Linden at https://codereview.productengine.com/secondlife/r/350/

--HG--
branch : product-engine
2010-06-08 23:30:56 +03:00
Sergei Litovchuk c4277e421c Implemented (EXT-4704) Add maturity icons to Prefs -> General.
--HG--
branch : product-engine
2010-02-24 23:41:04 +02:00
Monroe Linden 93c4a7a18f Finish up EXT-3908
Remove code for aspect ratio controls from LLFloaterPreference.  (The XUI had already been removed.)

Reviewed by Richard.
2010-02-10 17:16:38 -08:00
Ychebotarev ProductEngine 36a44ba0e9 fix for normal EXT-1888 Apply button remains active after Applying changes
--HG--
branch : product-engine
2010-02-04 15:37:25 +02:00
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 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
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 94a86f13b6 removing mCancelOnClose 2009-12-17 16:25:33 -08: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
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 26d481f385 (EXT-2343) Preference > Chat > ColorSwatch 's LLUIColorTable is not working 2009-11-10 22:49:25 +08: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
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
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 ca51e8f33d Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
2009-07-27 16:50:01 +00:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
Steven Bennetts ade6bbb06c merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3 2009-06-21 17:16:27 +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
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Steven Bennetts 0c0391cc71 QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> Release
merge Branch_1-20-14-Viewer-merge -> release
Includes Branch_1-20-Viewer-2 through 92456
2008-07-22 19:01:52 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00
Brad Kittenbrink 6d52efe452 Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932).

svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
Steven Bennetts 2e32d44e71 merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r 79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
2008-02-19 21:42:32 +00:00
Tess Chu 2f6c760624 svn merge -r 73926:74098 svn+ssh://svn/svn/linden/branches/viewer-auth-7 2007-11-20 02:53:43 +00:00
Tess Chu 813b140d07 svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge 2007-11-15 22:39:12 +00:00
Tess Chu 291d99bc66 svn merge -r73220:73877 svn+ssh://svn/svn/linden/branches/viewer-auth-6 2007-11-15 19:22:19 +00:00
Christian Goetze aa8b0cbe69 QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4 2007-10-17 22:09:27 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Monroe Williams 7138fb673a Merge down from Branch_1-18-1:
svn merge --ignore-ancestry  svn+ssh://svn.lindenlab.com/svn/linden/release@66449 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-1@67131
2007-08-02 01:18:34 +00:00
Don Kjer ad04e5fc55 revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into release
reverting jakes accidental check in
2007-06-29 01:49:41 +00:00
Jake Simpson e3989d3848 Changes to make Logitech code more LL Code Standards compliant, plus remove all the SDK code and instead just used headers and an included lib that we build ourselves from the Trunk directory. 2007-06-29 01:24:26 +00:00
Adam Moss 7b61f1d0ec land mozilla-https-fix branch, -> release 2007-05-26 00:50:37 +00:00
Don Kjer 60a09f20f4 Removing Logitech LCD code: svn merge -r 60616:60615 svn+ssh://svn/svn/linden/release into release 2007-05-08 20:42:04 +00:00
Don Kjer 1c909afe39 svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release 2007-05-02 21:24:47 +00:00
Jake Simpson 2f438a409e svn merge -r 59608:60615 svn+ssh://svn.lindenlab.com/svn/linden/branches/jakesbranch --> release
Adding Logitech G15 keyboard and Z10 speaker support for those LCD windows.
2007-04-18 21:08:54 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00