Commit Graph

287 Commits (ec7dbc704040dfcdcd101f090dbb2f780ca0ee8a)

Author SHA1 Message Date
Roxie Linden 2fd59393fc Automated Merge 2010-05-10 15:25:49 -07:00
Karl Stiefvater (qarl) 2673bd28d7 EXT-6775 Remove support for full-screen mode in Viewer 2. reviewed by Moss
(changes name of setting WindowFullScreen to FullScreen per discussion in jira.)
2010-05-05 13:40:55 -05:00
Roxie Linden a11ec0c89f Automated merge 2010-05-04 16:09:14 -07:00
Xiaohong Bao 1b82707771 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-30 22:52:40 -06:00
Xiaohong Bao 66a445298e the second round debug code for EXT-6792: Crash on ATI 3200 2010-04-30 17:28:09 -06:00
Xiaohong Bao bb01c04624 trival: remove extra llpushcallstacks, which is for debug only. 2010-04-30 12:56:44 -06:00
Monroe Linden dacc5afbf0 Architectural changes to LLPlugin message processing.
LLPluginProcessParent can now optionally use a separate thread for reading messages from plugin sockets.  If this is enabled, it will spawn a single thread and use apr_pollset_poll to wake up the thread when incoming data arrives instead of polling all the descriptors round-robin every frame.  This should be somewhat more efficient, and should also allow blocking requests from plugins to be serviced much more quickly (once we start using them).  This is currently disabled by default, until it's had a bit more focused testing on multiple platforms.

Hooked up the switch to use the message read thread to the PluginUseReadThread debug setting and an item in the Advanced menu in the viewer, and to a checkbox in the UI in llmediaplugintest.

Updated some debug logging in the plugin system to have appropriate tags and not log dire-looking warnings during normal operation.

LLPluginProcessParent now once again explicitly kills plugin processes (instead of just closing their sockets and waiting for them to exit).  The problem we were attempting to solve by not doing the kill (letting the webkit plugin write its cookie file on exit) has been solved another way.

LLPluginProcessParent::sendMessage() now attempts to write the outgoing message to the socket immediately instead of waiting for the next frame.  This should reduce the latency of sending plugin messages.

Added a separate fast timer for LLViewerMedia::updateMedia().
2010-04-27 17:25:01 -07:00
Brad Payne (Vir Linden) 7f0a778990 merge 2010-04-19 13:53:57 -04:00
Brad Payne (Vir Linden) aa5e494e0c For EXT-6809 - fixes suggested by Nyx code review 2010-04-19 13:52:59 -04:00
Brad Payne (Vir Linden) c5e338f240 merge 2010-04-19 10:13:49 -04:00
Tofu Linden 80ebd31ac4 trivial comment fix. 2010-04-19 13:08:33 +01:00
Tofu Linden 7462911bdd Change Linux fasttimer implementation back to RDTSC - using a reliable syscall was REALLY chewing CPU time. Sigh. I didn't realize how incredibly often this gets called. So, back to the assembly.
But be more careful with CPU clock count on linux, so the fasttimer values are much more accurate than they were the last time we were with RDTSC, in absolute terms - back in the right order of magnitude anyway.

Also change many instances of Mhz to MHz.
Also some minor comment fixes.
2010-04-19 12:49:15 +01:00
Brad Payne (Vir Linden) 142f867d38 For EXT-6809 - search static VFS for all asset types 2010-04-16 16:06:34 -04:00
Roxie Linden 8d8f167a4e automated merge with trunk 2010-04-19 16:24:05 -07:00
Tofu Linden 9fbe736774 (slightly hairy) merge from viewer-hotfix 2010-04-12 11:03:16 +01:00
Xiaohong Bao d64ccab573 the first round of the debug code for EXT-6792: Crash on ATI 3200 2010-04-09 23:48:50 -06:00
Roxie Linden 8ba5517a08 Automated merge 2010-04-07 13:20:33 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Xiaohong Bao 5aa6abb6be Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-07 11:54:03 -06:00
Xiaohong Bao 03b0c60ff5 fix for all wierd crashes happening to lltexturecache.cpp, cuased by running viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras:
EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145]
EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126]
possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-07 11:51:41 -06:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Richard Nelson eeeca91797 merge 2010-03-29 15:29:12 -07:00
Richard Nelson e50586043b EXT-3258 - Viewer freezes while external web browser loads page
reviewed by Callum
2010-03-29 15:28:48 -07:00
Loren Shih fbdd93bb91 EXT-6536 : Make LLVOAvatarSelf a singleton
No longer explicitly deleting gAgentAvatarp due to reference counting.
2010-03-29 14:45:21 -04:00
Loren Shih 0ffc73855b EXT-6536 : Make LLVOAvatarSelf a singleton
Fix for cleaning up gAgentAvatar on app shutdown.
2010-03-29 13:50:37 -04:00
Loren Shih b6e7850c0a Merge 2010-03-29 12:30:09 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Brad Payne (Vir Linden) b2a667b722 For EXT-4666: changed LLGestureManager to LLGestureMgr throughout 2010-03-29 11:10:54 -04:00
Monroe Linden 4e7838fb00 Implemented central storage mechanism for media plugin cookies.
Added LLPluginCookieStore, which manages the central list of cookies.

New Mac and Windows versions of llqtwebkit, built from the tip of the cookie-api branch on http://bitbucket.org/lindenlab/llqtwebkit/ (currently revision f35a5eab8c2f).

Added "set_cookies" and "cookie_set" messages to the media_browser message class in the plugin API, and made the webkit plugin use them appropriately.

Added methods to LLViewerMedia to read/write the cookie file and add/remove individual cookies.

Added hooks to read/write the cookie file (plugin_cookies.txt) in the same places as  the location history (idle_startup() in llstartup.cpp and LLAppViewer::cleanup(), respectively).

Reviewed by Richard at http://codereview.lindenlab.com/1006003
2010-03-26 15:39:21 -07:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Xiaohong Bao fad31dc087 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-03-25 17:46:36 -06:00
Xiaohong Bao 09d488e20b more fix for EXT-5711: Some textures loading from cache seems jammed.
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25 17:14:27 -06:00
Xiaohong Bao 88df86bcc3 fix for all wierd crashes happening to lltexturecache.cpp, cuased by running viewer 2.0 and viewer 1.23 at the same time. Specifically for the following jiras:
EXT-6692: crash at LLTextureCache::readEntryFromHeaderImmediately [secondlife-bin lltexturecache.cpp:1145]
EXT-6691: crash at LLTextureCache::writeEntryToHeaderImmediately [secondlife-bin lltexturecache.cpp:1126]
possible fix for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-07 11:51:41 -06:00
Xiaohong Bao 81350ec5a9 more fix for EXT-5711: Some textures loading from cache seems jammed.
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25 17:14:27 -06:00
Loren Shih 504cf0870d EXT-2959 : Pull out camera functions from llagent to llagentcamera
#3 checkin.

Took out llagent "friend llagentcamera" and added accessors instead.
Did some superficial formatting cleanup.
2010-03-25 15:06:48 -04:00
Loren Shih cc4a9b5640 EXT-2959 : Pull out camera functions from llagent to llagentcamera
#2 checkin.

Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
2010-03-24 16:12:01 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Roxie Linden 18b7ab0018 Weekly automated merge from viewer 2.0 2010-03-22 16:12:41 -07:00
Igor Borovkov 33746d7c73 merge
--HG--
branch : product-engine
2010-03-18 16:43:11 +02:00
Igor Borovkov 11e4b42ec9 merge
--HG--
branch : product-engine
2010-03-18 16:38:44 +02:00
Igor Borovkov 63375642c8 Backed out changeset 0305673fe81e EXT-4820 [NUX] Viewer dimensions on first-run
--HG--
branch : product-engine
2010-03-18 16:32:55 +02:00
Igor Borovkov c67bc96278 Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on first-run)
by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux."

--HG--
branch : product-engine
2010-03-18 16:31:09 +02:00
Igor Borovkov ec3443cc85 Backed out changeset 2624e0d8b6f4
--HG--
branch : product-engine
2010-03-18 16:27:34 +02:00
Igor Borovkov ba52dc2fd1 fixed EXT-4820 [NUX] Viewer dimensions on first-run
changed first run window height from 768 to 738

Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/38/

--HG--
branch : product-engine
2010-03-16 17:49:45 +02:00
Vadim Savchuk 04e692b3f1 Fixed bug EXT-6007 ([STRING IN EN] - While loading Second Life several messages need to be localized).
Reviewed by Richard: https://codereview.productengine.com/secondlife/r/31/

--HG--
branch : product-engine
2010-03-16 14:45:12 +02:00
Roxie Linden 20379fecd9 automated merge 2010-03-08 21:39:38 -08:00
Roxie Linden 8bd5a3bca3 DEV-45976 Last Login Location Preference not remembered 2010-03-08 15:10:27 -08:00
Tofu Linden 0775e91901 PE merge. 2010-03-07 15:27:17 +00:00
Richard Linden 931ff555bd merge 2010-03-05 14:46:00 -08:00