Commit Graph

115 Commits (ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a)

Author SHA1 Message Date
simon 64c5afa196 Merge latest viewer-release with FBC 2013-10-23 14:14:36 -07:00
maksymsproductengine 63cc379c72 MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found 2013-10-04 02:50:50 +03:00
Oz Linden 3364614f8b add "Settings" logging tag to make debugging settings loading easier 2013-08-29 09:27:12 -04: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
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07: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
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04: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
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
William Todd Stinson 67bc42a80a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-20 16:20:40 -08:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
simon@Simon-PC.lindenlab.com 7e7f183f0a Fixed LLControlGroup::get() template to not crash on missing items. Reviewed
by Kelly
2012-10-02 09:31:38 -07:00
Don Kjer 8ba2b38876 Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing. 2012-09-13 10:25:48 +00:00
Nat Goodspeed 9e4927ece5 Make LLTransUtil::parseStrings() merge all relevant strings.xml files.
Until now, adding a xui/en/strings.xml file in any non-default skin meant you
had to clone the entire file, editing only the particular entries you wanted
to override. With this change, we load strings.xml file(s) from the default
skin before loading the specified skin -- so a non-default skin can now
provide a strings.xml file containing only the specific entries it wants to
override.
2012-10-11 17:29:04 -04:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Richard Linden 0a28a63ce0 fix for gcc builds 2012-07-24 12:03:00 -07:00
Richard Linden 176b7d82be CHUI-227 FIX Teleport offers sent are not received
cleaned up serialization of LLSD to param block so that it can round-trip
also, optimized LLXMLNode and fixed an assert
2012-07-23 19:33:39 -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
Vadim ProductEngine e328dcf406 EXP-1849 FIXED Privacy settings could be set to default when modifying other preferences before login. 2012-02-06 23:07:41 +02:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Richard Linden e219fc30ba EXP-1837 FIX parsing notifications.xml during startup can take > 40 seconds (in non-release builds)
removed O(n^2) comparisons of XML nodes in favor of O(n)
2012-01-23 17:38:47 -08:00
Xiaohong Bao 2851cd5193 a try fix for sh-2651: [crashhunters] Crash after google translate failure
and sh-2658: crash in LLPluginMessage::parse
2011-11-28 11:33:49 -07:00
Xiaohong Bao be3c6747a8 remove redundant memory allocation for sh-2651: [crashhunters] Crash after google translate failure 2011-11-22 11:53:44 -07:00
Nat Goodspeed b59c0a6680 Automated merge with http://hg.secondlife.com/viewer-development 2011-09-06 13:58:47 -04:00
Nat Goodspeed 54399f1f87 CHOP-763: publish LLControlGroup::typeStringToEnum(), typeEnumToString()
These LLControlGroup methods were marked 'protected'. But they're important
for introspection: LLControlVariable::type() returns an eControlType;
understanding that value outside a C++ context requires typeEnumToString().
2011-09-01 13:01:08 -04:00
Xiaohong Bao 749d9ebadc Merge 2011-08-31 10:48:56 -06:00
Oz Linden f0bc8a0f71 convert tabs to spaces where they are forbidden 2011-08-17 12:33:23 -04:00
Xiaohong Bao d951267467 Merge from viewer-development 2011-07-15 12:14:34 -06:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05: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 8886460a22 SOCIAL-654 WIP Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory
made notification text skinnable
2011-03-09 00:21:57 -08:00
Loren Shih 037a83cd47 Automated merge up from viewer-development into mesh-development 2011-03-16 14:54:56 -04:00
Xiaohong Bao 01cdeb0cdd Merge from viewer-development 2011-02-23 10:44:59 -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
Loren Shih 618249155a Automated merge up from viewer-development 2010-12-13 10:08:55 -05:00
Xiaohong Bao f4ff1430f0 first iteration of memory pool code 2010-12-03 22:16:16 -07:00
Monroe Linden 1e050c2ed8 merge 2010-12-02 14:33:42 -08:00
Loren Shih bfd8efb057 Automated merge up from viewer-development 2010-12-01 10:55:24 -05: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
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Richard Linden 0fa63baf37 fix for gcc 2010-10-07 11:30:55 -07:00