summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
2010-04-07PE merge from pe-viewer-trunkTofu Linden
2010-04-07mergeTofu Linden
2010-04-07Fixed normal bug EXT-6600(Block List button in Preferences does nothing ↵Eugene Mutavchi
prior to login (should be disabled)) - added disabling of Block List button if user is not logged in. Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/186/ --HG-- branch : product-engine
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-02Manual merge from default branch.Vadim Savchuk
Resolved a conflict in indra/llui/llurlentry.cpp. That broke the fix for EXT-6357. --HG-- branch : product-engine
2010-04-02PE mergeTofu Linden
2010-04-02DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunkRoxie Linden
Includes: DEV-45800, DEV-45803 - Grid Manager DEV-45804 - SLURL refactor DEV-45801 - Single username field (for Identity Evolution and SLE Ldap) Also, Includes Certificate Management code allowing the viewer to connect to grids not signed by a well know key (just like any web browser). Also contains secure storage for things like passwords. The security/certificate code is modular with the intention of adding modules to directly use the operating system facilities for crypto if available. (that's much more secure than we'll ever be) Also, refactor of voice to modularize it, and add a diamondware voice module. CR: Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-01EXT-5168 prefs review: Remove "Small nametags" optionLeyla Farazha
reviewed by Richard cc#176
2010-04-01Fixed bug EXT-6337 (Changing maturity settings in preferences floater only ↵Vadim Savchuk
works on first floater spawn when account is not age verified). I'm actually copying an existing fix from the viewer-hotfix branch. See the ticket for more details. Not reviewed. --HG-- branch : product-engine
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-18Fix for EXT-6304: Shared media cookies cannot be deleted via PreferencesMonroe Linden
Added static member functions to LLViewerMedia: clearAllCookies(), clearAllCaches(), setCookiesEnabled(), and setProxyConfig(). These iterate through all loaded instances and send appropriate messages. Also added a hack to clearAllCookies() to delete cookie files for all accounts, which should serve until we centralize cookie storage. Made LLViewerMedia set the proxy config properly when creating new instances. Callum is adding code to do something similar with the cookies enabled flag in a separate commit. Removed get_web_media from llfloaterpreference.cpp and reworked everything that used it to use the new LLViewerMedia functions instead. Reviewed by Callum at http://codereview.lindenlab.com/838003.
2010-03-17fixed EXT-6284 ([HARD CODED] - Menu Einstellungen, Tab Erweitert: ↵Igor Borovkov
"MiddleMouse" needs to be localized) Control value is preserved, it is being localized on presentation Reviewed by Richard at https://codereview.productengine.com/secondlife/r/24/ --HG-- branch : product-engine
2010-03-08automated mergeRoxie Linden
2010-03-05Fixed (EXT-4704) Add maturity icons to Prefs -> General.Sergei Litovchuk
- Added icons updating upon opening Prefs -> General panel. --HG-- branch : product-engine
2010-03-04fixed reopened EXT-4131 [BSI] "Only friends and groups can call or IM me" ↵Igor Borovkov
NEEDS auto-response --HG-- branch : product-engine
2010-03-03Fixed normal bug EXT-5885 ([HARD CODED] - The busy response should be ↵Andrew Dyukov
localized. hard coded in llviewermessage.cpp). - It wasn't hardcoded in llviewermessage.cpp, but xml which contains it is not localizable. Added string with default busy message to strings.xml and used it in LLFloaterPreference::cleanupBadSetting(). --HG-- branch : product-engine
2010-02-24Implemented (EXT-4704) Add maturity icons to Prefs -> General.Sergei Litovchuk
--HG-- branch : product-engine
2010-02-24Fixed normal bug EXT-5512 (Change in text size for already written chat is ↵Eugene Mutavchi
not updated. Only affects new chat) --HG-- branch : product-engine
2010-02-18PE merge.Tofu Linden
2010-02-18EXT-5461: Reverting change 49e628c3a0c5.Lynx Linden
Renaming skins/base back to skins/default to unblock I10n. Revert was requested by Q.
2010-02-18mergeVadim Savchuk
--HG-- branch : product-engine
2010-02-18Fixed low bug EXT-4057 - Preferences: Draw Distance value of < 100 displays ↵Dmitry Zaporozhan
without an "m". Removed redundant code, there is no DrawDistanceMeterText1 so no need to switch visibility. --HG-- branch : product-engine
2010-02-17Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfixChuck Linden
2010-02-17mergeRichard Linden
2010-02-17EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds corrupts ↵Richard Linden
1.23s UI reviewed by Leyla
2010-02-17EXT-5272: move prefs out of nearby mediaRick Pasetto
Review #114 This (mostly XUI) change moves the prefs checkboxes out of the nearby media panel and into the prefs floater. The "Sound" tab is now the "Sound & Media" tab, and its layout has been modified drastically to match https://docs.google.com:443/a/lindenlab.​com/Doc?id=ddznhrqn_34kcxdz8f3#​Preferences
2010-02-17EXT-4843 [NUX] Set default PreferencesTofu Linden
'General' pane
2010-02-16 EXT-618 Low/Mid/High response is broken in Preferences > Graphicsangela
2010-02-10Finish up EXT-3908Monroe Linden
Remove code for aspect ratio controls from LLFloaterPreference. (The XUI had already been removed.) Reviewed by Richard.
2010-02-10CID-92Tofu Linden
Checker: FORWARD_NULL Function: LLFloaterPreference::onBtnCancel() File: /indra/newview/llfloaterpreference.cpp CID-91 Checker: FORWARD_NULL Function: LLFloaterPreference::onBtnApply() File: /indra/newview/llfloaterpreference.cpp
2010-02-10CID-93Tofu Linden
Checker: FORWARD_NULL Function: LLFloaterPreference::onBtnOK() File: /indra/newview/llfloaterpreference.cpp
2010-02-04fix for normal EXT-1888 Apply button remains active after Applying changesYchebotarev ProductEngine
--HG-- branch : product-engine
2010-01-29Fixed normal bug EXT-4355 (Preferences: Location of logs does not show full ↵Mike Antipov
path) - changed "control_name" for view with log path to the "InstantMessageLogPath" - also changed a line editor state from "disabled" to "readonly" to have a chance to scroll text to see full path in this field. --HG-- branch : product-engine
2010-01-25Merge conflict resolution.Tofu Linden
2010-01-25"Fix" confusion over media settingsRick Pasetto
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-25fixed linux buildIgor Borovkov
--HG-- branch : product-engine
2010-01-25implemented EXT-4131 [BSI] "Only friends and groups can call or IM me" NEEDS ↵Igor Borovkov
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-15Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2010-01-15FIX EXT-3957: add "Media Enabled" checkbox to Privacy PrefsRick Pasetto
review http://codereview.lindenlab.com/271074
2010-01-14clean up LLFrstUse and it's notification but leave OverideKeys and Sandbox ↵angela
intact -- reviewed by james
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ↵angela
open, movement controlled, etc)
2010-01-12 EXT-1645 [BSI] Selection Beam color preference (My Effects) isn't ↵angela@angelas-macbook-pro.local
remembered after re-log EXT-1644 [BSI] Selection Beam color preference (My Effects) doesn't honor color choice -- reviewed by richard
2010-01-06DEV-44804 autoplay preference for media should enable the media subsystem ↵Tofu Linden
when toggled from off to on
2009-12-29EXT-3720 Added Advanced > Set Window Size... for video makingJames Cook
Torley needed this to make tutorial movies. Removed dead code from Preferences. Reviewed by Leyla.
2009-12-21EXT-3523 Missing God Mode functions in User ProfileLeyla Farazha
EXT-2635 No message reminding user that a restart is required to reset cache (was Clear Cache) reviewed by Richard
2009-12-17removing mCancelOnCloseLeyla Farazha
2009-12-17mergeLeyla Farazha
2009-12-17EXT-3534 Default Location Obscures the Top of an Open Notecard When Nav ↵Leyla Farazha
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-15Fix for normal bug EXT-3465 - Any changes made in Preferences floater are ↵Dmitry Zaporozhan
canceled after viewer shutdown. --HG-- branch : product-engine
2009-12-08EXT-3118 disabled Alerts appear to be enabled in PreferencesJames Cook
Wasn't rebuilding the list of alerts on Preferences open Cleaned up some formatting in llfloaterpreference.cpp