Commit Graph

1276 Commits (7a95c3a0aedf2df8f62f4fa5f75813cd1ed3f5db)

Author SHA1 Message Date
Nicky 2c880e6cce Remove functionally not used since month (op. new/delete/pool) or that was the same as LL's (*_aligned_*) 2013-10-09 20:40:27 +02:00
Nicky 2a4bafc3dd Rework allocation logging so other parts can hook into it to report their stats too. 2013-10-07 16:59:46 +02:00
Tank_Master 893d6eea80 Merge LGPL 2013-09-23 22:12:36 -07:00
Cinders 21771a6bd0 Import patch from McCabe Maxstead of Inworldz to fix the hang on disconnect error there. 2013-09-23 21:58:09 -06:00
Cinders ddedc6b542 FS will fail to run well before this on ppc, drop this warning. 2013-09-23 20:52:46 -06:00
Tank_Master d0be5c3817 Merge LGPL 2013-09-17 18:54:41 -07:00
Ansariel 71c2fe69ca Comment out duplicate clean up call for LLAvatarAppearance; Found by Drake Arconis/Sovereign Engineer 2013-09-16 11:03:25 +02:00
Kadah_Coba 0c4edbce51 - readded : per-skin (non-persistant) settings overrides (by Kitty Barnett)
-> by default settings will be loaded from the settings.xml file in the current skin folder
    -> settings are applied *after* the session specific options
2013-09-14 16:27:05 -07:00
Tank_Master 1ec4c1c2b1 Merge LGPL 2013-09-14 13:39:45 -07:00
Nicky 4d72711e8e Fix for GCC warning. 2013-09-14 18:42:38 +02:00
Tonya Souther cbfb83c435 Linux compile fix. 2013-09-13 00:06:08 -05:00
Tank_Master eaaf782fdf Merge LGPL 2013-09-12 21:18:44 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Cinders 75d7a2c16b Hardcode fullscreen mode OFF and hide the UI for it on mac until that's fixed. For now, users can use the native cocoa fullscreen mode 2013-09-12 21:30:12 -06:00
Cinders 96e04da82c Unique BundleID for OS vs Havok flavors 2013-09-09 22:49:08 -06:00
Cinders 57bdc9426c Trivial removal of an extra space in window title 2013-09-09 22:09:19 -06:00
Cinders c69f3acef8 Merge LL 3.6.5 2013-09-09 19:07:03 -06:00
simon e7ac4695e3 Merge viewer-release 2013-09-09 12:59:17 -07:00
Ansariel 3073c750ae Some more caching of frequently called gSavedSettings 2013-09-06 20:31:24 +02:00
Cinders fa0500013f Insert missing string 2013-08-29 09:17:17 -06:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Oz Linden a359d9d80c merge changes for 3.6.4-release 2013-08-27 10:37:02 -04:00
Tank_Master 831e4f443b Merge LL 3.6.3 pass 1 2013-08-26 17:09:27 -07:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07: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
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
Cinders 7ff86206b5 FIRE-11357: Convert deprecated conversation logging bool to the new S32 for it when performing a settings restore 2013-08-17 17:08:46 -06: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 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
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
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
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