31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
f3b1efae5d
put the KDU, Fmod*, and CEF versions back in the About info
2016-02-07 10:26:34 -08:00
b46627ffc4
add build configuration to the About box if it is not Release
...
remove some superfluous other information from About
2016-02-04 23:32:42 -05:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
3612d7d14b
merge
2016-01-15 16:42:39 -05:00
e7eaa94dfa
Merge VR
2016-01-15 13:36:38 -08:00
5a6fce5b62
MAINT-489 various cache and log files not being deleted
2016-01-04 19:10:51 +02:00
60dfd55eda
Merge downstream, version 4.0.1
2015-12-22 11:07:18 +02:00
909e409743
Merge
2015-12-18 14:10:02 -08:00
3f81bb15b3
merge
2015-12-18 13:55:41 -05:00
6dd80980cf
Merge
2015-12-18 10:16:26 -08:00
f4b6a89ab0
Throttle consecutive connect attempts.
2015-12-15 11:13:47 -08:00
317644f5d5
MAINT-5860: remove timestamp from the about box (version id is enough)
2015-11-13 17:19:28 -05:00
9848fc4253
merge changes for 4.0.1-release
2016-01-15 17:01:16 -05:00
4b7ff25eba
merge changes for 4.0.0-release
2015-12-18 10:44:42 -05:00
059925eafb
Added code to initiate controlled shutdown of plugins with timeouts for misbeahving plugin.
2015-11-10 13:45:30 -08:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
bd817f6f42
MAINT-5754: Basic keyboard functionality on the Mac. Still incomplete
2015-11-06 14:12:30 -08:00
11c428759e
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2015-11-02 14:09:43 -05:00
07496b015b
Pulled merge from bento prime.
2015-10-27 15:33:21 -07:00
97374a5362
Fixes SL-202 joint offset and skin weight import. Race condition still exists.
2015-10-27 15:15:34 -07:00
501033f521
MAINT-3491 FIXED If ALM is enabled while in wireframe mode, disabling wireframe mode results in a black screen.
2015-10-27 18:06:36 +02:00
d365aa10f1
SL-234 WIP - moved LLSkinningUtil funcs to separate class/files. Remap weights where needed. Warn that related debug settings require restart to take effect.
2015-10-21 16:47:03 -04:00
6599e10d00
Merge with tip of viewer-release
2015-10-20 16:39:00 -07:00
825106f0ee
MAINT-5732: Behavior #2 . Be sure that the internet stream is stopped before destroying the streaming audio interface. Otherwise FMODEX blocks on close.
2015-10-19 16:08:38 -07:00
53b947e039
Merge from viewer release.
2015-10-19 12:03:08 -07:00
69ff937e47
merge changes for 3.8.5-release
2015-10-13 08:43:03 -04:00
cb7f84a470
MAINT-5687: Remove old webkit from the make files and the repo. Ensure that it is no longer meaningfully referenced.
2015-10-02 11:14:28 -07:00
2a37a8b1cc
Add cleanup to LLCore prevent occasional crash on exit.
2015-09-21 17:01:26 -07:00
1eed334e7f
MAINT-5629: Remove llares and llareslistener. Login now does not attempt to do a lookup on the server names and rewrite the URL.
...
MAINT-5614: Bad password status correctly detected.
2015-09-21 10:59:58 -07:00
907efc9cc9
MAINT-5507: Remove llcurl, move constant values and untilities to llcorehttp lib
2015-09-15 17:01:26 -07:00
196caf21a8
MAINT-5507: Removal of sdrpc client/server
...
MAINT-5507: removal of LLCurl::Easy, LLCurl::Multi LLCurl::Responder
2015-09-14 16:10:20 -07:00
97236a42ca
MAINT-5507: Remove HTTPClient and related cruft.
2015-09-14 11:15:23 -07:00
96e343b49b
MAINT-5575: Convert the Experience cache into a coro based singleton.
...
--HG--
branch : MAINT-5575
2015-09-01 16:13:52 -07:00
1db2c7276d
Merge with viewer-release
2015-08-31 11:17:28 -07:00
2efe91ef64
merge changes for 3.8.3-release
2015-08-18 15:05:01 -04:00
c2f9c5ac81
merge changes for 3.8.0-release
2015-07-09 12:30:57 -04:00
79ffc6569b
Merge from viewer-relese and become version 3.8.1
2015-07-01 14:40:05 +03:00
8eb7e9d952
Merge with head of viewer-release
2015-06-30 11:51:58 -07:00
77da469d6f
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2015-06-30 14:50:37 -04:00
f7908a5029
Point to new version of LLCefLib with support for second life URLs, version string, navigation commands
2015-06-30 00:07:58 +01:00
11b48840c7
MAINT-5250 Viewer should handle large number of calling cards better
2015-06-16 20:18:27 +03:00
95fc2d48ec
merge changes for 3.7.30-release
2015-06-15 15:53:45 -04:00
1fce3cc89e
corrections needed for new tools
2015-06-08 17:35:18 -04:00
949942c730
merge changes for 3.7.29-release
2015-06-08 16:33:02 -04:00
3720ed0613
Merge downstream code
2015-06-09 17:01:50 -07:00
2684c53690
Merge from viewer-relese and become version 3.8.1
2015-07-02 14:50:23 +03:00
107b9bcb70
MAINT-5232: Introduce SUBSYSTEM_CLEANUP() macro
...
and use it for existing LLSomeClass::cleanupClass() calls.
This logs the fact of making the call, as well as making it.
2015-05-20 10:56:09 -04:00
76872412a2
MAINT-5138 FIXED Second Life Viewer's window title is "Second Life " with a trailing space
2015-05-19 00:44:43 +03:00
89321a56fd
increment viewer version to 3.7.29
2015-04-28 12:03:31 +03:00
b2200f06da
MAINT-5147: correct menu colors for test viewers
2015-04-22 16:06:48 -04:00
a219cf1c98
Merge viewer-release
2015-04-15 15:07:13 -07:00
a8ef252571
merge changes for 3.7.27-release
2015-04-13 16:23:36 -04:00
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
8b42c7898e
replace llifstream and llofstream with std::ifstream and std::ofstream respectively
2015-04-07 17:59:28 -04:00
3a57b18896
convert llifstream and llofstream to std::ifstream and std::ofstream respectively
2015-04-07 17:28:05 -04:00
66bc510786
detect xml errors in parsing xml files and remove those files
2015-04-02 21:43:34 -04:00
3cf8a1ce6e
Clean up impostors and visual muting
...
Rename the settings that control them to be more descriptive
Remove the separate boolean setting (RenderUseImpostors) that governed both
Establish default values based on gpu class for impostors and visual muting
2015-02-20 12:56:45 -05:00
53fb7f9998
merge storm-2082 changes
2015-02-04 08:45:49 -08:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
027899963c
merge with 3.7.23-release
2014-12-19 23:20:47 +02:00
797f221e67
MAINT-4708 better grouping of ack messages between viewer and server
2014-12-18 20:05:36 +02:00
fe627f6474
MAINT-4716: correct reading of and debug display for avatar render cost info
2014-12-15 15:59:49 -05:00
35a8938892
MAINT-4690 FIXED forced send_agent_update(TRUE) in idle() results in large amounts of useless UDP traffic
2014-11-25 16:29:40 +02:00
fbaff6d3a0
Eliminate LLAppViewer::cleanup() dup --analyzeperformance code block.
...
Not sure at what point the redundancy was introduced, but it seems clear we
only want to run performance analysis once per shutdown.
2014-11-12 17:55:52 -05:00
3920d946c6
Introduce fast_exit() wrapper for _exit() so we can boost::bind() it.
2014-10-14 16:44:29 -04:00
f9113c286f
Merge
2014-10-09 16:10:00 -07:00
c25a786640
Pulled merge from viewer-tiger
2014-09-19 10:54:55 -07:00
b12e241751
Merged with windows fixes.
2014-08-15 18:51:20 -07:00
370aa671c6
Allegedly hides voice position on teleport. Needs testing.
2014-08-15 18:49:54 -07:00
7060527bbc
Added delay to Windows shutdown to let SLVoice die a good death.
2014-08-15 17:30:09 -07:00
7540664183
Ported from defective branch.
2014-08-13 18:12:25 -07:00
81c342dfa9
Merge with 3.7.13-release
2014-08-06 09:22:43 -07:00
487fce4afa
Merge with 3.7.11-release
2014-07-09 15:22:12 -07:00
3e6698073c
Merge viewer-release and become version 3.7.12
2014-07-07 14:49:45 -07:00
bfa42c9e28
Merge downstream code and become 3.7.12
2014-07-07 16:17:53 -07:00
d760a6889d
Merge downstream code
2014-06-18 19:02:25 -07:00
299921de32
Merge with 3.7.9-release
2014-06-17 13:09:15 -07:00
592024b580
Merge viewer-release and become version 3.7.9
2014-06-17 10:40:42 -07:00
e15002a11c
merge changes for 3.7.9-release
2014-06-16 11:42:37 -04:00
47a5e1c751
MAINT-4009: Ensuring that the local bitmaps are cleaned up on app exit.
2014-06-05 23:15:43 +01:00
98720c3cec
Merge
2014-06-05 06:31:30 -07:00
a7b523b36a
MAINT-4071 FIXED Use LLViewerStats::instance().getRecording() to get correct stats.
2014-05-29 13:49:25 +03:00
0481494c2d
Merge with 3.7.8-release
2014-05-20 10:03:09 -07:00
babd89b770
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2014-05-19 22:19:55 +01:00
dc4c184696
Merge downstream version 3.7.8 code
2014-05-07 13:19:05 -07:00
48fece4473
Merge with 3.7.7-release
2014-05-07 11:14:26 -07:00
250db74bf9
Pull and merge viewer-release as version 3.7.8
2014-05-07 10:56:41 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
37d620463b
MAINT-4009: Cleaning up the error callstacks memory before app quit.
2014-04-28 19:18:47 +01:00
5e225213f6
MAINT-4009: Adding an ares cleanup call to free the allocated memory.
2014-04-23 17:57:23 +01:00
f515e2b1ee
Merge with 3.7.6-release
2014-04-22 16:34:30 -07:00
ae564140c0
Merge
2014-04-22 12:19:28 -06:00
b4ca93cadc
merge up to 3.7.6-release
2014-04-22 13:05:26 -04:00
b1a7137ba6
merge changes for 3.7.6-release
2014-04-21 16:21:31 -04:00
a5a0a0b136
Merge downstream code
2014-04-21 12:48:50 -07:00
0b9a777bfd
Merge downstream code updating version to 3.7.7
2014-04-21 12:36:35 -07:00
e5dae42252
Fix for MAINT-5707 bad breakpad behavior with teleport links
2014-04-14 15:11:42 -07:00
ae5b48495f
Merge with 3.7.5-release
2014-04-14 10:16:39 -07:00
375c05ac43
merge changes for 3.7.5-release
2014-04-08 11:41:12 -04:00
32bbb07f0a
merge changes for 3.7.5-release
2014-04-08 11:36:22 -04:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
c9620e24d3
Merge downstream code
2014-04-07 14:29:18 -07:00
991636d57b
Merge in viewer-release and version update to 3.7.6
2014-04-07 14:26:15 -07:00
1d15ac293b
Double init of logging probably due to merge fail.
2014-03-26 05:26:10 -07:00
9ea2694c0e
Not ideal but sufficient.
2014-03-26 02:07:29 -07:00
5b7929364b
Still wasn't doing the right thing with log files.
2014-03-25 18:30:39 -07:00
0893b49ebd
The simple approach has not worked. This hybrid solution should avoid the Windows issues and get us per-run logfiles.
2014-03-24 22:44:51 -07:00
35ab71d8ea
Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities.
2014-03-20 12:04:39 -07:00
bd4f4ee793
logging cleanup in support of debugging text editor problems
2014-03-19 14:17:13 -04:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
706ec08deb
Merged in viewer-release
2014-03-13 21:55:22 +00:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
34c12d009c
Merge
2014-03-10 13:06:06 -07:00
d2bb4dae98
Fixes for crash reporter startup race condition, crash reporter CPU use, Secondlife.log filehandle, XP Crash.
2014-03-07 14:58:22 -08:00
800409bdfc
Maint-3135 Discovered apple made this change in 10.6.8 not 10.7.0
2014-02-18 14:11:17 -08:00
262f8b8473
Was not using correct name for results of file search.
2014-01-26 02:56:23 -08:00
ea7e6a5174
Some cleanup of string to wstring conversion and vice versa.
2014-01-14 15:28:35 -08:00
ddd6b8f91b
Mac Fullscreen fix for MAINT-3288 and MAINT-3135
2013-12-17 00:12:26 -08:00
6b84d40558
added some comments and changed calls from get_master_thread_recorder()
...
over to get_thread_recorder() to be agnostic about which thread we're running on
2013-12-05 21:58:45 -08:00
ce2cd00cc5
Removed debugging code.
2013-12-04 19:57:11 -08:00
6809348125
Creating a cleaner branch
2013-12-03 17:06:06 -08:00
391ac367d6
SH-4634 FIX Interesting: Viewer crashes when receiving teleport offer
...
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
2013-11-19 17:40:44 -08:00
89d5d01c41
MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fields
...
moved viewer information strings into LLAppViewer
replaced Help>Report a Bug with direct use of Jira link
2013-11-11 18:41:25 -08:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
33efe8d3c2
SH-3419 Replace per-object time dilation factor with region-wide
...
Reviewed with Simon
2013-10-25 16:46:18 -07:00
7bbb802385
Merge with 3.6.9
2013-10-25 09:52:31 -07:00
ab43be5ddb
moved some common functionality from LLTrace::BlockTimerStatHandle to BlockTimer
...
updates appearance utility dependency
2013-10-23 13:24:47 -07:00
9f097380b8
removed asserts in order to get testable builds again
...
added unpause() behavior and changed pause() to do nothing when already stopped
2013-10-18 09:14:53 -07:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
1e32b9dd33
Pull merge of lindenlab/viewer-release
2013-10-04 09:47:26 -07:00
c2c060d440
Merge with 3.6.7
2013-10-04 09:19:25 -07:00
754e8752a9
added initial memory usage tracking for lltrace
2013-10-03 14:30:34 -07:00
e0a443f5a6
BUILDFIX: fix for mac builds
...
also, fixed alignment of tick labels on stat bars
2013-09-27 11:18:39 -07:00
fc8c3a4cf7
merge
2013-09-16 21:12:18 -07:00
42d66af318
FIX: SH-4499 Mac generates lots of 'Entering main_loop' log spam
2013-09-13 11:28:51 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
094a226fd8
Pull from lindenlab/viewer-release
2013-09-09 14:27:48 -07:00
e7ac4695e3
Merge viewer-release
2013-09-09 12:59:17 -07:00
07cb32449f
Merge with 3.6.5
2013-09-09 12:46:20 -07:00
c6b6ae7a45
merge
2013-09-07 21:54:03 -07:00
3fd68662f2
added memory usage and occlusion events to traces
...
renamed "current" to "primary" when referring to accumulators
2013-09-07 21:16:39 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
3364614f8b
add "Settings" logging tag to make debugging settings loading easier
2013-08-29 09:27:12 -04:00
c767354a20
merging viewer release
2013-08-28 18:30:38 -07:00
d29268f331
Merge
2013-08-27 16:51:05 -07:00
a359d9d80c
merge changes for 3.6.4-release
2013-08-27 10:37:02 -04:00
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
7ca10e5161
merge changes for 3.6.4-release
2013-08-26 15:14:12 -04:00
74d4933ab7
reversion of object cache version number change
2013-08-26 11:32:58 -06:00
b667d20e00
fixed issue with poor framerate after clearing cache
2013-08-23 15:34:41 -07:00
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
a8d5b070b0
merging viewer release
2013-08-22 14:58:10 -07:00
c42a91421f
merge changes for 3.6.3-release
2013-08-20 10:37:10 -04:00
98628066eb
Merge
2013-08-19 17:17:20 -07:00
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
82bf4e4db2
merge changes for DRTVWR-285
2013-08-19 15:15:15 -04:00
612892b45a
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
25937040de
SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
...
converted many values over to units system in effort to track down
source of 0 ping
2013-08-16 12:38:12 -07:00
b39cf4770b
Backed out changeset: ed09997b4652
2013-08-12 20:08:18 -07:00
b8d49dab9a
merge
2013-08-12 20:07:41 -07: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
86b4019684
merge changes for DRTVWR-333
2013-08-07 12:17:39 -04:00
ddef4d7ff7
revert some LLUnit changes to temporarily fix SH-4399: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second
2013-08-06 16:35:46 -06:00
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
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
910874a7e3
more cleanup
2013-07-30 19:14: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
4a17569605
merge changes for CHOP-975
2013-07-30 16:12:19 -04:00
64c1fb0b82
get rid of warning generated by trying to save obsolete VersionChannelName setting
2013-07-30 11:46:08 -04:00
ee0b66f080
VITA test framework - record events support
2013-07-25 16:07:16 -04:00
dce3f9bc8f
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
added commented out log timestamp override for scene load performance monitoring
2013-07-24 23:07:34 -07:00
3430444212
BUIDLFIX: forgot to extract value from units object for calling llformat
2013-07-24 22:41:02 -07:00
1e8f9fd80d
SH-4376 FIX: Interesting: in Statistics, replace the text "0" with "n/a" when
...
there are no samples during the time period.
added hasValue to SampleAccumulator so we don't print a value when we don't have
a single sample yet
added some disabled log output for scene load timing
2013-07-24 19:36:43 -07:00
40a7c63e89
fixed crash on exit
2013-07-22 18:22:08 -07:00
11e14cd3b0
SH-4299Interesting: High fps shown temporarily off scale in statistics console
...
various fixes to lltrace
start() on started recording no longer resets
fixed various instances of unit forgetfullness in lltrace
recording split now has gapless timing
scene monitor now guarantees min sample time
renamed a bunch of stats
added names to debug thread view on windows
2013-07-15 11:05:57 -07:00
34c77159f7
CHOP-963: Make update service query url depend on the grid rather than settings
2013-07-09 08:39:22 -07:00
d122318bef
SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics console
...
added percentage/ratio units
added auto-range and auto tick calculation to stat bar to automate display stats
2013-07-08 00:55:17 -07:00
d8565b05a5
CHOP-959: Introduce CmdLineChannel settings var, map --channel to it.
2013-07-02 16:33:40 -04:00
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
04bdc8ba83
SH-4294 FIX Interesting: Statistics Texture cache hit rate is always 0%
...
also, removed LLTrace::init and cleanup
removed derived class implementation of memory stat for LLMemTrackable
is automatic now
2013-07-01 17:04:01 -07:00
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
2fc422f39d
fixed memory leak due to implementation of LLThreadLocalSingleton
...
removed LLThreadLocalSingleton
collapsed all thread recorder classes to single type, LLTrace::ThreadRecorder
moved fasttimer stack head to llthreadlocalsingletonpointer via ThreadRecorder
2013-06-30 13:32:34 -07:00
ffa7123bb5
SH-4299 FIX Interesting: High fps shown temporarily off scale in statistics console
...
added ability to force uniqueness of LLCopyOnWritePointer
converted more variables to units
added convenience function for unit constants
2013-06-28 20:45:20 -07:00
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
808d3eff19
SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics console
...
fixed some lltrace logic errors
more consistent syncing of timestamps of sample values in recording stack
selection of primary buffers was completely incorrect
assignment of recordings got wrong play state due to implicit
operator = defined in base class
fixed asset stats only working up to the first send
2013-06-27 00:07:21 -07:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
7da4c65191
Pull merge from lindenlab/viewer-release
2013-06-19 14:06:06 -07:00
9c83d4b5b8
Merge with viewer-release.
2013-06-19 15:47:57 -04:00
ea40b3a37b
Merge with viewer 3.6.0
2013-06-19 09:58:43 -07:00
c5fc8f9006
SH-4246 FIX interesting: fast timers significantly decreases framerate
...
moved collapsed flag to fast timer tree node
2013-06-19 08:23:53 -07:00
0af636e632
Merged with viewer-release
2013-06-17 04:39:47 -04:00
9fd3af3c38
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed Units macros and argument order to make it more clear
optimized units for integer types
fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-13 15:29:15 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
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
9def3590f4
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
fixed multithreading lltrace causing values to be interpolated towards 0
added Radians unit
improved sceneloadmonitor restart heuristic to use accumulated camera motion
2013-05-31 16:01:46 -07:00
e50e600408
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
reverted SlaveThreadRecorder update gating
moved processTimes() outside of Recording, so it is called only once per frame
refined sample merge logic so that multi-threaded samples do not stomp on linear history
of a stat
2013-05-30 20:15:48 -07:00
1f84fe88c6
Pull merge from viewer-release
2013-05-30 14:54:15 -07:00
174cfa0a7a
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting/
2013-05-29 17:03:45 -07:00
9ae76d1215
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
fixed copy construction behavior of Recordings to not zero out data
split measurement into event and sample, with sample representing
a continuous function
2013-05-29 17:00:50 -07:00
507ce0d84f
Merge downstream code
2013-05-29 14:42:19 -07:00
3698aece0d
Merge latest viewer-release
2013-05-29 14:37:22 -07:00
ebc604fa8d
Merge with 3.5.4 release
2013-05-29 11:44:22 -07:00
52e8b2a1a2
for SH-4004: interesting: need debug option to clear viewer cache while still logged in
2013-05-28 18:25:12 -06:00
e4e01ea7cc
fix for SH-4214: Crash on Linux readFromCache: ASSERT (mInitialized)
2013-05-28 17:44:50 -06:00
f66b71262e
merge changes for maint-2724
2013-05-24 09:49:18 -04:00
774544bc51
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
2013-05-23 18:26:14 -06:00
16616ae48d
for SH-4145: Interesting: Implement occlusion culling for object cache
2013-05-23 18:25:21 -06:00
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
1c740dfb51
Pull merge from viewer-release
2013-05-22 14:21:49 -07:00
ee3efc01e4
Merge downstream code
2013-05-20 11:31:04 -07:00
f940ccac71
Get latest from viewer-release
2013-05-20 11:29:00 -07:00
716a963d55
Merge with viewer-release
2013-05-20 10:08:27 -07:00
efa839b75a
merge changes for 3.5.3-beta6
2013-05-16 14:37:14 -04:00
12c34dc30f
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
renamed LLView::handleVisibilityChange to onVisibilityChange to reflect
cleaned up scene monitor stats recording, now all trace stats dumped to csv
also fixed extendablerecording, periodicrecording, etc. to properly implement start/stop/etc
2013-05-16 00:53:01 -07:00
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
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
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
e1c1428569
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
2013-05-11 20:38:23 -07:00
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
4d22c32aa9
merge changes for 3.5.2-beta4
2013-05-10 10:56:40 -04:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
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
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
2a7d604e87
ACME-306 : Pull merge from viewer-chui
2013-05-02 17:37:29 -07:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
f36171b8ca
made sendURLToOtherInstance() happen before viewer window actually appears, in the event of an external browser launching a SLApp
2013-04-26 23:35:28 +01:00
e1dbbd0213
removed internal browser hack for getting auth code in favor of SLApp-only approach
2013-04-26 21:26:38 +01:00
3bb708d706
merge up to latest viewer-development for merge to 3.5.2
2013-04-19 14:42:56 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
eec08ef64c
Merge with viewer-development
2013-04-18 15:59:22 -07:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
327c99cadb
merge up to 3.5.2 development
2013-04-16 16:01:32 -04:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
b42b789723
Merge in downstream code (chui fixes, materials)
2013-04-11 16:18:34 -07:00
c7bab8ab8b
Merge
2013-04-11 16:04:21 -07:00
288b43facb
Automated merge with bundle:c:\code\viewer-interesting+c:\users\richard\appdata\local\temp\thg.63pnn4\ssh__hg.lindenlab.com_richard_viewer-interesting-metrics_efdmpj.hg
2013-04-08 13:59:19 -07:00
56badfe349
Merge with viewer-development
2013-04-04 17:10:28 -07:00
f684d897f5
Merge with viewer-development
2013-04-02 15:04:41 -07:00
ce0dbbd8a5
Add reporting of last_exec_duration
...
(and clean up logic around multiple instances)
2013-04-02 12:57:09 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d8dc74b833
MAINT-2426 : Viewer support for new simulator AvatarRenderInfo capability. Reviewed by Kelly
2013-03-28 16:06:07 -07:00
aad93f4e52
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
2013-03-25 21:25:06 -06:00
268ea2902d
for SH-3833: dump frame diff values from the scene loading monitor to a log file
2013-03-25 21:23:59 -06:00
98a82c50d5
Pull in downstream CHUI code from viewer-development
2013-03-25 11:12:52 -07:00
f1539b7279
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
2013-03-22 10:57:19 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
933691ad13
for SH-4004: interesting: need debug option to clear viewer cache while still logged in
2013-03-20 16:29:48 -06:00
5c19f15dca
Removed avatar stuff from asset metrics, again. Must have gotten broken in a merge at some point.
2013-03-20 11:43:34 -04:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
8de397b19e
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
1586107e87
SH-3944 WIP CHUI merge fixing
...
re-introduced don's refactor of low-level openGL calls pulling out of llui
and putting them into llrender. Took the new code from their updated versions
from the CHUI merge, but put them in a place accessible to appearance utility.
2013-03-12 22:34:15 +00:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
f07b9c2c69
renamed LLTrace stat gathering classes/methods to make the structure of LLTrace clearer
...
Count becomes CountStatHandle
Count.sum becomes sum(Count, value), etc.
2013-03-06 11:08:25 -08:00
609ed855e1
MAINT-2371 More optimizations.
...
Reviewed by Graham
2013-03-04 18:01:42 -06:00
741821eb6a
SH-3867 FIX - on logout, wait for any pending metrics uploads to complete
2013-02-15 09:52:11 -05:00
b03918c73d
removed reference to std::string::back for linuxy compilation
2013-02-11 11:57:42 -08:00
f3e407ae3f
SH-3852 WIP - removed avatar metrics from ViewerAssetMetrics
2013-02-11 13:50:26 -05:00
99d197d021
SH-3852 WIP - track per-timer stats
2013-02-07 19:14:00 -05:00
b0f2f02333
Removed (most) references to older FMOD library - still a little Linux clean up left
2013-02-01 08:44:52 -08:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
e179add865
CHUI-667: Attempting to correct Mac/Linux build issue.
2013-01-29 11:02:23 -08:00
4c5790d4bf
CHUI-667: Post code review changes
2013-01-28 18:27:54 -08:00
c418d61627
CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-25 17:47:36 -08:00
f39532c407
Merged with latest viewer-dev.
2013-01-24 16:36:31 -05:00
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
3e8bc28c88
Merge
2013-01-23 13:36:50 -08:00
573ab07a40
Merge pull from lindenlab/viewer-beta
2013-01-10 14:51:59 -08:00
8315e97453
Merge
2013-01-08 14:50:31 -07:00
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08:00
966a4c893c
OS X crash on startup fix: always ensure that mMainLoopInitialized is initialized properly within LLAppViewer::init(). Otherwise, the viewer will sporadically crash on start up.
2013-01-02 16:16:07 -05:00
bd152c1fb7
Huge amount of refactoring to use Cocoa here:
...
- Updated to .xib format. To produce a new nib (which is required after changing the xib file), use "ibtool SecondLife.xib --compile SecondLife.nib" within the newview directory.
- xib file now defines the viewer's window. VIews are still being pragmatically added to the main window. This may change in the future.
- LLAppViewer's main loop has been slightly refactored to be executed on a timer for OS X. This probably needs a bit more work.
- Event handling still needs more work to work within a timer based event loop. It works fairly sporadically at the moment, as if events are being dropped between timer executions, at least for the mouse.
- Carbon has been purged from the viewer's startup, and from LLWindow entirely. There's likely still a few odds and ends fragmented throughout the viewer and its dependencies. Need to track these down.
- LLAppViewerMacOSX now uses NSApplicationMain, and also implements the NSApplicationDelegate protocol in LLAppDelegate.
- Fullscreen support has been implemented for OS X 10.7+
This is still a work in progress, however at this stage everything needed for a functional viewer is (mostly) complete. From here, it's mostly just bug hunting and fixing.
2012-12-29 06:59:43 -05:00
c219282f5d
SH-3406 WIP convert fast timers to lltrace system
...
removed some potential data races
got memory stats recording in trace system
2012-12-18 20:07:25 -08:00
179e944f45
Updated client to use new caps
...
brought over server changes to llExperienceCache
2012-12-18 16:06:00 -08:00
834a956a70
We now handle local_id=0 in KillObject as a prefix to deleted local_id's.
...
This is the real viewer-side work that was the motivation for MAINT-2123.
Reviewed with Bao.
2012-12-13 15:43:10 -08:00
eca33374fb
MAINT-2123 remove WARNINGS about unknown local_id in KillObject message
...
We now ignore unkown local_id's in KillObject.
Reviewed with davep.
2012-12-13 15:30:46 -08:00
407e5013f3
SH-3406 WIP convert fast timers to lltrace system
...
converted fast timer view over to new lltrace mechanisms
2012-12-03 19:54:53 -08:00
ca2207bd35
SH-3406 WIP convert fast timers to lltrace system
...
fixed scale of reported times
moved reset calls to happen at same time so we don't show partial results
2012-12-01 00:17:04 -08:00
ca37317a14
SH-3406 WIP convert fast timers to lltrace system
...
fixed crash when sending viewer asset stats
2012-11-30 15:48:22 -08:00
e83700b56d
MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to update their drivers.
...
Reviewed by Simon
2012-11-30 17:03:12 -06:00
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
0e1283cf6d
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
2012-11-27 20:19:10 -08:00
93aca485ba
SH-3406 WIP convert fast timers to lltrace system
...
fixed precision of fast timer counts
2012-11-27 20:17:37 -08:00
1c894c05c1
SH-3406 WIP convert fast timers to lltrace system
...
hunting down bad values and crashes
2012-11-27 17:26:12 -08:00
bc8b81b16d
Merge
2012-11-26 08:42:57 -08:00
67bc42a80a
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-20 16:20:40 -08:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
7ab282a09c
merge changes for DRTVWR-246
2012-11-20 11:30:31 -05:00
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
ad3f7ea13f
Merge
2012-11-19 08:21:04 -08:00
2cde962d5d
Test populating the experience keys UI with avatar name data.
2012-11-19 08:06:42 -08:00
Oz Linden