summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpreference.cpp
AgeCommit message (Collapse)Author
2015-02-24merge changes for 3.7.25-releaseOz Linden
2014-12-10Rename llround(..) to ll_round(..) because of a collision with MS llround ↵callum_linden
(long long round) in VS2013
2014-10-18Update to build on Xcode 6.0: remove lots of unused variablescallum_linden
2014-10-09Merge downstream code and become 3.7.18simon
2014-09-29MAINT-4473 FIXED Don't erase logs location path on pressing Cancel button.Mnikolenko ProductEngine
2014-09-19MAINT-4458 FIXED Enable/disable combobox instead of changing its visibility.Mnikolenko ProductEngine
2014-07-15Merge with viewer-releaseCallum Prentice
2014-05-07Merge with viewer-releaseCallum Prentice
2014-05-07merge changes for 3.7.7-releaseOz Linden
2014-03-28MAINT-3880 FIX Show favorite landmarks on login screen checkbox, is checked ↵callum_linden
in preferences after being unchecked
2014-03-12merge with releaseRichard Linden
2014-03-10merge changes for 3.7.3-releaseOz Linden
2014-02-05MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:maksymsproductengine
- memory leaks fixing;
2013-12-12STORM-68 Remove Apply buttonJonathan Yap
Add menu entry to Build->Options->Set Default Permissions... Disable Preferences->Advanced->Default Creation Permissions button when on login screen Add code for a one-time conversion from the old upload settings XML cleanup
2013-11-19merge up to 3.6.10-release; some of the storm-68 changes lostOz Linden
2013-11-06merge with releaseRichard Linden
2013-11-06MAINT-3374 FIXED Don't show username after display name if this setting is ↵Mnikolenko ProductEngine
disabled.
2013-10-08merge from viewer-releaseRichard Linden
2013-10-03merge changes for 3.6.7-releaseOz Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-09-09merge changes for storm-1888Oz Linden
2013-08-26Merge downstream code from CHUIStorm releasesimon
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-06-27Merged lindenlab/viewer-release into defaultCinder Roxley
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-05-22STORM-1888: Hide Spellchecker Settings floater when Preferences floater is ↵Cinders
closed Bonus: Correct the immediately preceding auto replace comment
2013-05-15CHUI-945 FIXED Add Object IMs to Chat Notification PreferencesPavelK ProductEngine
2013-05-09NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders ↵Graham Madarasz
loaded successfully
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-09MAINT-2417 FIX Update Graphics tab layoutcallum_linden
2013-03-28CHUI-799 FIXED Notification is not given to user when they select only ↵AlexanderP ProductEngine
friends and groups can IM me preference
2013-03-13CHUI-839 : Fixed! Make the LLLineEditor in chat preferences read-only but ↵Merov Linden
selectable
2013-03-11CHUI-778: Adjusted text in prompts for deleting chat log and chat ↵Gilbert Gonzales
transcripts (per UX).
2013-03-04CHUI-778: Now when changing paths for chat logs and transcripts any empty ↵Gilbert Gonzales
conversations will be reloaded with data from the new location. Use case for this is if the users nearby chat is empty and they switch to a location that has a nearby chat file, then the nearby chat file be loaded.
2013-02-25mergeGilbert Gonzales
2013-02-25CHUI-778: Pushing a quick fix that only pertains to CHUI-778 so we can close ↵Gilbert Gonzales
out this issue.
2013-02-22CHUI-778 (Saving preferences updates text in all open message panels in ↵Gilbert Gonzales
conversation floater to show as old messages) Now changing the log/transcripts file location actually moves the files to the new location. Prior behavior just started a new history at that location. Also a fix was made so that if the user changed the log/transcripts path then after pressing the Preferences 'OK' button the new location will be saved to the corresponding .xml file.
2013-02-20CHUI-778: Minor changes, prior commit was not changing the file path ↵Gilbert Gonzales
correctly due to logic error. Also clicking the 'Cancel' in preferences would still cause the file location to be saved instead of ignore the save.
2013-02-19CHUI-778 (Saving preferences updates text in all open message panels in ↵Gilbert Gonzales
conversation floater to show as old messages) Problem was that closing the preferences floater was always acting as if the conversation transcripts/log files path had changed. If the path did not change then the user's conversations would be cleared and re-loaded as if they were part of the user's history (causing text to be grey). Solution: Now keep track of when the path was changed and only load up the transcripts/log upon change.
2013-02-18CHUI-779 FIXED Chat log preferences are disabled before login.Mnikolenko ProductEngine
2013-02-18CHUI-742 FIXED Do not update Log locations immediately after selecting a new ↵Mnikolenko ProductEngine
location.
2013-02-12CHUI-742 FIXED Update log location when closing Preference floater.Mnikolenko ProductEngine
2013-02-06CHUI-712 FIXED IM log files renamed with ll.txt will create double files for ↵maksymsproductengine
users
2013-02-04CHUI-721 FIXED Delete transcripts when performing Clear log action.Mnikolenko ProductEngine
2013-01-24CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tabmaksymsproductengine
2013-01-04CHUI-580 : Fixed : Avoid fetching names while reacting to display name ↵Merov Linden
checkbox change (overkill), make display name pref disabled when usePeopleAPI is off
2012-12-12Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.William Todd Stinson