c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
e00cc1c9ce
Add LessThanEquals and GreaterThanEquals sanity type checks and remove kludges in settings.xml
2015-05-01 21:58:23 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
6ddfc8031c
BUILDFIX - miscellaneous stuff missed in the merge
2013-11-12 11:42:06 -08:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
63cc379c72
MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: Control named RenderAutoMuteFunctionsnot found
2013-10-04 02:50:50 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
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-07-30 19:13:45 -07:00
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
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
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
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
7e7f183f0a
Fixed LLControlGroup::get() template to not crash on missing items. Reviewed
...
by Kelly
2012-10-02 09:31:38 -07:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
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
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
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
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
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
b59c0a6680
Automated merge with http://hg.secondlife.com/viewer-development
2011-09-06 13:58:47 -04:00
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
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
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
f4ff1430f0
first iteration of memory pool code
2010-12-03 22:16:16 -07:00
a510ca889d
Added settings sanity checking system.
2011-12-13 00:46:43 +01:00
7394730eaa
Merge up to LL FUI
2011-10-28 02:00:09 -04:00
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
7065a9ef5e
Making a llerrs error message more readable by putting a space where it should have had one.
...
(LGPL) //only to get in the habbit of needing that in the message
2011-01-18 20:47:47 -08:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
138bf11322
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
...
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684
improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
0274c1f2b1
Merged work for DEV-2066 (and formerly QAR-1538) in Viewer 2.
...
merged all changes, post copy, from the following branches:
linden/brachnes/enable-o-v
user/cg/qar-1538
user/mani/viewer2-enable-o-v
2009-07-16 17:54:58 +00:00
fcaa1ad46f
QAR-1383: convert new uses of Boost.Signals (arriving from other branches) to
...
Boost.Signals2 like the rest of the event-system-n code.
2009-06-22 12:52:18 +00:00
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
087bd26553
Merge of QAR-1383 event-system-7 into trunk.
...
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
24b26d71ee
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merge latest 1.26 into trunk
2009-03-20 20:00:47 +00:00
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
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
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
16baf6c9d4
merge release-QAR-499 Viewer 1.20 RC 3
...
merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28 23:29:46 +00:00
e3b97ac65b
merge release@82383 viewer-cleanup2-7-merge@82828
...
QAR-369
2008-03-20 21:41:26 +00:00
672a76d0ea
reverting premature commit at 82410.
2008-03-15 01:18:27 +00:00
04611efae8
[NOTE: This was an erroneous commit, and was reverted in the next revision]
...
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14 23:21:38 +00:00
39affbc544
svn merge -r80947:81066 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-0-Viewer
...
* Respect pre-1.19.0 voice settings
* Re-fix DEV-11213 "SECURITY: Web site can use IFRAME to launch SL and steal your password"
2008-02-29 01:18:00 +00:00
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
d1582a5105
merge -r 57111:57464 maintenance.
2007-02-05 20:20:42 +00:00
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00
Oz Linden