Commit Graph

79 Commits (9abf29e9955b2ca039482ca2cb3fcffbe7375175)

Author SHA1 Message Date
Ansariel 682535dd16 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/cmake/00-Common.cmake
#	indra/llcommon/stdtypes.h
2023-07-19 10:27:16 +02:00
Nat Goodspeed 230c96b20d SL-18330: Remove some set-but-unused vars flagged by Xcode 14.3. 2023-04-03 13:53:18 -04:00
Ansariel 817532155b Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-29 09:37:14 +02:00
Brad Payne (Vir Linden) d556a8a974 SL-13834 - omit string-type controls from preference logs 2020-08-31 20:51:40 +01:00
Brad Payne (Vir Linden) 9cc0510b4e SL-13834 - add preferences info to ViewerStats, only when exiting and different from default 2020-08-26 16:06:29 +01:00
Ansariel 8abb2cd6b3 Merge branch 'DRTVWR-460' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersavecamerapreset.cpp
#	indra/newview/llpanelvolumepulldown.cpp
#	indra/newview/llpanelvolumepulldown.h
#	indra/newview/llpresetsmanager.cpp
#	indra/newview/skins/default/xui/en/floater_camera.xml
2020-04-23 19:21:00 +02:00
Mnikolenko Productengine 74d6e6b65c SL-12904 FIXED Camera Preset does not restore correctly when sitting 2020-04-20 14:27:22 +03:00
Ansariel 0e36db79e1 Merge viewer-neko 2018-12-01 16:34:33 +01:00
andreykproductengine baeca41027 SL-10089 Logs to see which gSavedSettings.get calls should be cached 2018-11-19 20:20:34 +02:00
Ansariel 09e3cab862 Add suggestion what to do in case of "Must supply a comment for control x" error to error message 2017-12-12 20:07:12 +01:00
Ansariel 1ca7437292 Transplant settings improvements to sanity check types 2016-03-31 21:52:47 +02:00
Ansariel 14954d999d Merge viewer-quickgraphics 2016-03-31 18:54:45 +02:00
Oz Linden 518f92126f improve settings error log, and make type conversion methods static 2016-03-23 11:50:39 -04: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
Ansariel d9dc061224 Fix fake booleans 2015-08-04 09:59:42 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Ansariel e00cc1c9ce Add LessThanEquals and GreaterThanEquals sanity type checks and remove kludges in settings.xml 2015-05-01 21:58:23 +02:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Oz Linden 3364614f8b add "Settings" logging tag to make debugging settings loading easier 2013-08-29 09:27:12 -04:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Nat Goodspeed d2386652f8 CHOP-962: Make LLControlVariable::setPersist() accept only enum.
Initial change made LLControlVariable::mPersist an enum, but retained
bool/BOOL public API. setPersist(true) set one value, setPersist(false) set
another, forcePersist() set the third. Per code review, expose enum to public,
make setPersist() (and LLControlVariable constructor, and LLControlGroup::
declareControl(), and all the LLControlGroup::declareMumble() methods, and all
the unit-test dummy declareMumble() method bodies) accept that enum. Remove
forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly.
Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25 16:46:51 -04:00
Nat Goodspeed 35bc91fc5d CHOP-962: Emit unrecognized-var log message only for Global settings.
LLControlGroup::loadFromFile() can of course detect which LLControlGroup
instance it's loading. We only want to log unrecognized settings variables in
LLControlGroup "Global". Settings for "Don't show me this again" notifications
are in group "Warnings".
2013-07-22 22:06:48 -04:00
Nat Goodspeed fd14c250b8 CHOP-962: Preserve unrecognized user settings variables.
Change LLControlVariable::mPersist from bool to tri-state enum. Its 'true'
value used to mean "persist only if changed from default;" third state now
means "persist regardless of value." Add forcePersist() method to set that.
Replace isSaveValueDefault() method -- used only by logic to determine whether
to save the variable -- with shouldSave() method to encapsulate ALL that logic
rather than only part of it. shouldSave() recognizes PERSIST_ALWAYS state.
When loading an unrecognized control variable from a user settings file, use
forcePersist() to ensure that we later save that variable again.
Tweak one of the unit tests to adjust for new semantics.
2013-07-17 11:30:09 -04:00
Nat Goodspeed 2b3c1bd40d CHOP-962: Make LLControlGroup::declare* return LLControlVariable*
LLControlGroup::declareControl(), declareString() etc. etc. all used to return
BOOL -- which no one ever examines because it unconditionally returned TRUE.
Make it return the (possibly new) LLControlVariable* instead.
2013-07-17 08:23:42 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Don Kjer 54cdc322b8 Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam. 2013-03-05 22:05:22 -08:00
Tank_Master 6007d1235e merge snowstorm repo 2013-10-19 23:48:44 -07:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 1d43cb8943 Merge SSB push 4 2013-03-08 17:54:49 -08:00
ziree dbe377dd65 First draft of settings backup. Lacks selective restore, any form of notification or error messages yet. FIRE-1723 2013-01-07 21:37:25 +01:00
Ansariel e3f1d1b981 First round of URL updates for the new firestormviewer.org domain 2013-01-04 21:59:45 +01:00
Tank_Master cb24ec2e0d merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
Todd Stinson 55392ef7f6 EXP-1942,EXP-1945: Altering behavior when setting maturity preference to check the server response in an effort to ensure the viewer and server remain in sync. This is a partial commit as I still need to add user behavior and notifications when things go wrong. 2012-05-24 19:41:20 -07:00
Ansariel 12c3c4c747 Possible crash fix for sanity checker 2012-01-15 22:05:01 +01:00
brad kittenbrink 42fe138cbb Incorporated some suggestions from code review for VWR-25610 2011-04-27 19:13:17 -07:00
brad kittenbrink 2840bff773 FIX VWR-25610: LLControlCroup::loadFromFile makes unnecessary copies of large LLSD objects. 2011-04-26 15:10:39 -07:00
Richard Linden 5aa43e4f3e SOCIAL-545 WIP Figure out how to configure skylight-specific settings while retaining relevant user settings (login account name, etc.)
converted settings_file.xml to use param block descriptions for easier modification
added session settings file and user session settings file for per-session config overrides
2011-02-22 19:30:50 -08:00
Monroe Linden 1e050c2ed8 merge 2010-12-02 14:33:42 -08:00
Nat Goodspeed 656b936915 Add name, value info to convert_from_llsd<> specialization LL_ERRS.
Prior to this, you could get a viewer crash whose ERROR: message said only:
convert_from_llsd<std::string>: Invalid string value
This gave no hint as to *which value* was wrong, or where to go fix it.
Ironically, each convert_from_llsd<> specialization already has the
control_name and LLSD value in hand; added these to each such LL_ERRS message.
2010-11-09 14:40:32 -05:00
ziree a510ca889d Added settings sanity checking system. 2011-12-13 00:46:43 +01:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00