Commit Graph

989 Commits (ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a)

Author SHA1 Message Date
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
Merov Linden 094a226fd8 Pull from lindenlab/viewer-release 2013-09-09 14:27:48 -07:00
simon e7ac4695e3 Merge viewer-release 2013-09-09 12:59:17 -07:00
Oz Linden 3364614f8b add "Settings" logging tag to make debugging settings loading easier 2013-08-29 09:27:12 -04:00
Gilbert Gonzales c767354a20 merging viewer release 2013-08-28 18:30:38 -07:00
Oz Linden a359d9d80c merge changes for 3.6.4-release 2013-08-27 10:37:02 -04:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07:00
Oz Linden 7ca10e5161 merge changes for 3.6.4-release 2013-08-26 15:14:12 -04:00
Graham Madarasz (Graham Linden) 19726783cd MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr so singleton cleanup doesn't do things it really ought not do 2013-08-23 14:44:46 -07:00
Gilbert Gonzales a8d5b070b0 merging viewer release 2013-08-22 14:58:10 -07:00
Oz Linden c42a91421f merge changes for 3.6.3-release 2013-08-20 10:37:10 -04:00
Oz Linden 70cacc4d17 merge changes for 3.6.3-release 2013-08-19 15:51:40 -04:00
Oz Linden 82bf4e4db2 merge changes for DRTVWR-285 2013-08-19 15:15:15 -04:00
Oz Linden 86b4019684 merge changes for DRTVWR-333 2013-08-07 12:17:39 -04:00
Nat Goodspeed 7f6e7fc0cb CHOP-951, IQA-1477: Validate args for numeric command-line switches.
The logic in llcommandlineparser.cpp's setControlValueCB() callback function
for converting command-line switch argument values from string to the actual
type of the map-to settings variable had a couple special cases for boolean
and LLSD array. But for S32, U32 and F32, it simply used default LLSD
string-to-numeric conversion. LLSD's string-to-numeric conversion is a bit
lame: for non-numeric strings, it shrugs and returns 0.
Introduce onevalue() and badvalue() helper functions that, like certain errors
during command-line parsing, throw LLCLPError. Use them to streamline certain
redundancies in setControlValueCB(). Introduce convertTo<T>() helper function
that uses boost::lexical_cast() for slightly more stringent conversions. Add
cases for U32, S32 and F32 targets.
setControlValueCB() is actually called only by LLControlGroupCLP::notify(),
not during actual command-line parsing.
Make LLControlGroupCLP::notify() return bool. Make it catch LLCLPError, set
the error for getErrorMessage() and return false on that exception.
Package LLAppViewer::initConfiguration()'s response to initParseCommandLine()
returning false as a new handleCommandLineError() function; invoke it both
there and when LLControlGroupCLP::notify() returns false.
2013-08-05 19:43:06 -04:00
Nat Goodspeed 32a953f65e CHOP-959: Honor --graphicslevel switch even on first viewer run.
Previous CHOP-959 logic set a flag to remember that settings variable
RenderQualityPerformance was set (by --graphicslevel), so it could be applied
once LLViewerWindow is constructed. But on first viewer run, LLViewerWindow
constructor calls LLFeatureManager::applyRecommendedSettings(), which resets
that settings variable! So don't just set a flag, actually capture the
requested RenderQualityPerformance value for later.
2013-08-02 10:50:19 -04:00
Oz Linden 4a17569605 merge changes for CHOP-975 2013-07-30 16:12:19 -04:00
Oz Linden 64c1fb0b82 get rid of warning generated by trying to save obsolete VersionChannelName setting 2013-07-30 11:46:08 -04:00
Jeff (Gioffredo Linden) ee0b66f080 VITA test framework - record events support 2013-07-25 16:07:16 -04:00
Oz Linden 34c77159f7 CHOP-963: Make update service query url depend on the grid rather than settings 2013-07-09 08:39:22 -07:00
Nat Goodspeed d8565b05a5 CHOP-959: Introduce CmdLineChannel settings var, map --channel to it. 2013-07-02 16:33:40 -04:00
Nat Goodspeed 09d8d17382 CHOP-959: Introduce CmdLineLoginLocation var for --url and --slurl.
Route --url and --slurl command-line switches through a common settings
variable. Treat them uniformly now. (Previously, passing --url would notice a
grid-specific SLURL and preselect that grid; --slurl wouldn't. Now both do.)
2013-07-02 15:30:49 -04:00
Nat Goodspeed 3d9c74dcc8 CHOP-959: Introduce and use settings vars for some cmd_line switches.
The cmd_line.xml entries:
analyzeperformance
crashonstartup
debugsession
disablecrashlogger
logmetrics
logperformance
noquicktime
replaysession
all specify map-to settings.xml variables -- none of which existed! Introduce
such variables. Instead of detecting the presence of a particular switch in
the command-line parser, use the value of its corresponding settings variable.
2013-07-01 16:19:24 -04:00
Nat Goodspeed c08b60ac6f CHOP-959: Streamline processing for --graphicslevel switch.
Use map-to in cmd_line.xml to inform the command-line processor that the
target variable for --graphicslevel is RenderQualityPerformance.
That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc.
Moreover, previous switch statement only accepted 0 - 3, whereas
LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce
LLFeatureManager::isValidGraphicsLevel() and use that to validate.
Replace switch statement in setGraphicsLevel() mapping int constants to string
literals with static vector of level names, using same data for mapping as for
validating level numbers.
2013-06-28 15:26:18 -04:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Dave Parks 9ea2d90a0d Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-06-20 12:10:26 -05:00
Merov Linden 7da4c65191 Pull merge from lindenlab/viewer-release 2013-06-19 14:06:06 -07:00
Geenz 9c83d4b5b8 Merge with viewer-release. 2013-06-19 15:47:57 -04:00
Geenz 0af636e632 Merged with viewer-release 2013-06-17 04:39:47 -04:00
Oz Linden dd2ede9991 Fix and organize code for managing marker files that detect last_exec_event and last_exec_duration 2013-06-03 17:49:51 -04:00
Merov Linden 1f84fe88c6 Pull merge from viewer-release 2013-05-30 14:54:15 -07:00
simon 507ce0d84f Merge downstream code 2013-05-29 14:42:19 -07:00
simon 3698aece0d Merge latest viewer-release 2013-05-29 14:37:22 -07:00
Oz Linden f66b71262e merge changes for maint-2724 2013-05-24 09:49:18 -04:00
Nat Goodspeed 3be79d5371 MAINT-2724: Make viewer explicitly set coroutine stack size.
Introduce LLCoros::setStackSize(), with a compile-time default value we hope
we never have to use. Make LLAppViewer call it with the value of the new
settings variable CoroutineStackSize as soon as we've read settings files.
(While we're at it, notify interested parties that we've read settings files.)
Give CoroutineStackSize a default value four times the previous default stack
size. Make LLCoros::launch() pass the saved stack size to each new coroutine
instance.
Re-enable lleventcoro integration test. Use LLSDMap() construct rather than
LLSD::insert(), which used to return the modified object but is now void.
2013-05-23 16:28:20 -04:00
Merov Linden 1c740dfb51 Pull merge from viewer-release 2013-05-22 14:21:49 -07:00
simon ee3efc01e4 Merge downstream code 2013-05-20 11:31:04 -07:00
simon f940ccac71 Get latest from viewer-release 2013-05-20 11:29:00 -07:00
Oz Linden efa839b75a merge changes for 3.5.3-beta6 2013-05-16 14:37:14 -04:00
Oz Linden ffec03515e MAINT-2665: fix crashes being counted as wrong type in last_exec_event due to log macro wrapper 2013-05-15 15:45:30 -04:00
Graham Madarasz c334a185f3 NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker 2013-05-14 05:59:48 -07:00
Geenz 3779e51bfc Merged with https://bitbucket.org/lindenlab/viewer-beta 2013-05-13 22:22:51 -04:00
Graham Madarasz e1c1428569 Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial 2013-05-11 20:38:23 -07:00
Graham Madarasz e413f4b335 Fixup merge diffs 2013-05-10 15:13:07 -07:00
Oz Linden 4d22c32aa9 merge changes for 3.5.2-beta4 2013-05-10 10:56:40 -04:00
simon ee2fce8790 Merge downstream code and viewer-beta 2013-05-09 14:10:45 -07:00
simon c7f7c4bc4d Merge viewer-beta 2013-05-09 13:14:49 -07:00
Richard Linden d8f00dd1d1 MAINT-2665 FIX Crashes not being reported in some cases
made marker file lock use append, not truncate
2013-05-09 10:54:32 -07:00
Oz Linden 1b984d8f40 merge changes for 3.5.1-release 2013-05-08 14:46:00 -04:00