Commit Graph

328 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
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
Eugene Mutavchi 48fd4c8d14 Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux.
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
Xiaohong Bao d33b6a1887 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-03-05 09:15:18 -07:00
Xiaohong Bao b0d4919fd4 fix for EXT-5683: viewer crashes at llcommon/llworkerthread.cpp(323): ERROR: LLWorkerClass::checkWork: ASSERT(workreq). 2010-03-04 15:02:30 -07:00
Ychebotarev ProductEngine b6d5909ddc partitial fix for major EXT-4820 [NUX] Viewer dimensions on first-run
need to specify desctop width and height for macos and linux (see LLDesctopInfo in llsys.cpp for details)

--HG--
branch : product-engine
2010-03-04 15:43:14 +02:00
Richard Nelson 41a30a59fb initial work changing topctrl to popup layer 2010-03-02 14:21:58 -08:00
Palmer Truelson 0980df1e0c merge 2010-02-23 17:07:18 -08:00
Palmer Truelson da79eb5545 Turning on Davep optimizations again. Backed out changeset d89b00b44ab6 2010-02-23 16:48:49 -08:00
Kent Quirk 2d00beeed2 Backed out cpp changes from changeset 49e628c3a0c5 2010-02-18 20:36:03 -05:00
Richard Linden 366aa236f2 EXT-5461 - Installing 1.23.5 release version over recent 2.0 builds corrupts 1.23s UI
reviewed by Leyla
2010-02-17 14:37:28 -08:00
Palmer Truelson 3b8463f0fd merge 2010-02-12 21:06:25 -08:00
Palmer Truelson 1f672990e7 Backed out davep's optimization pass. changeset 3c3685de430a 2010-02-12 21:06:02 -08:00
Palmer 418504207b merge 2010-02-12 15:16:19 -08:00
Xiaohong Bao 4139e26926 change the cache version number to force to clear old cache. 2010-02-10 10:34:33 -08:00
Eugene Mutavchi d3d389c698 Update of major bug EXT-5022 (streaming media first use dialog should be removed)
--HG--
branch : product-engine
2010-02-09 19:18:17 +02:00
Xiaohong Bao 68ea8e13ac partial fix for EXT-4352. fixed mutex deadlocks and turned on the multi-threaded texture fetching. 2010-02-08 14:40:06 -08:00
Tofu Linden ec0dd8968c Update the rest of the LLEventTimer users to #include lleventtimer.h. I think. 2010-02-06 19:19:07 +00:00
richard e75a4ffb6a EXT-5026 - Crash when exiting from login screen
reviewed by Mani
2010-02-05 14:20:27 -08:00
Mark Palange (Mani) 90be737898 EXT-4232 Keeping gSpashScreen up until the viewer window appears.
Move the call to LLSpashScreen::hide() to the point where we show the main window.
Reviewed by Richard
2010-02-05 13:19:42 -08:00
Dave Parks ff0271d632 merge 2010-02-04 23:43:13 -06:00
Mark Palange (Mani) b94e5b597a Backed out changeset: b579077ebc79
I gave lynx a bad review. :( I didn't know about the setting FirstLoginThisInstall.
I'm backing out lynx's change, then re-fixing EXT-4237.
2010-02-04 13:39:51 -08:00
Lynx Linden fe5dc0351c EXT-4237: Don't show Start Up pulldown until successful login.
Previously any login attempt, even a failed one, would cause the Start
Up pulldown to appear. Now only a successful login will cause this to
happen. Also renamed the setting FirstRunThisInstall to the more accurate
HadFirstSuccessfulLogin (and inverted its logic).

Reviewed by Mani.
2010-02-04 00:32:53 +00:00
Dave Parks 8e67ecf3dc Optimization pass.
-- Further instrumentation of idle update
-- Removed mActiveQ from LLPipeline, instead making calm objects static during LLVOVolume::idleUpdate
-- Further instrumentation of flexible object update
-- Converted LLDynamicArray and LLMap members of LLViewerObjectList to stl counterparts
-- Increased number of update bins in LLViewerObjectList from 16 to 128 (objects will be processed every 128 frames instead of every 16, or ~ 90% fewer objects processed per frame)
-- Removed unused "renderObjectsForSelect" code.
-- Reenabled LOD updates for objects further than 24m from camera
2010-02-03 12:33:32 -06:00
Mark Palange (Mani) 58f813a136 merge 2010-02-02 14:45:42 -08:00
palange 6abecf1228 pushing to private repo to move to windows development. 2010-02-01 11:23:30 -08:00
Igor Borovkov 81451696f1 fixed EXT-4187 "X" does not close client after idle timeout / log off when "Confirm before I quit" is enabled
--HG--
branch : product-engine
2010-01-29 18:03:11 +02:00
Igor Borovkov 56d0654437 got rid from lltoolbar.h includes
--HG--
branch : product-engine
2010-01-29 14:18:56 +02:00
Rick Pasetto d3f361752e Plumb getting and setting the system audio mute through appviewer
Next step is to actually implement the OS-specific calls to do so.
Until then, behavior is the same; the status bar will mute/unmute
the "master" audio for the viewer *only*
2010-01-27 14:00:02 -08:00
Nat Goodspeed df7e5dd1dc DEV-35248: Allow NoVerifySSLCert to uniformly disable verification
Introduce static LLCurl SSL verification flag, default 'true', accessed by
LLCurl::setSSLVerify() and getSSLVerify().
Make LLCurl::Easy::prepRequest() check LLCurl::getSSLVerify() instead of
unconditionally setting CURLOPT_SSL_VERIFYPEER 'true'. Also set
CURLOPT_SSL_VERIFYHOST to match.
Make LLXMLRPCTransaction::Impl::init() examine LLCurl::getSSLVerify(), instead
of directly examining gSavedSettings.getBOOL("NoVerifySSLCert").
Make LLURLRequest::checkRootCertificate() set CURLOPT_SSL_VERIFYHOST as well
as CURLOPT_SSL_VERIFYPEER.
Make request() in llhttpclient.cpp (used by LLHTTPClient::getByteRange(),
head(), get(), getHeaderOnly(), put(), post(), postRaw(), postFile(), del(),
move()) pass LLCurl::getSSLVerify() to checkRootCertificate(), rather than
constant 'true'.
Make LLAppViewer::mainLoop() call
    LLCurl::setSSLVerify(! gSavedSettings.getBOOL("NoVerifySSLCert"))
at the same time it calls LLCurl::setCAFile(), a comparable bit of static
setup.
2010-01-20 15:48:13 -05:00
Xiaohong Bao a8cc535f54 temporarily disable the texture fetching thread again to avoid mutex deadlocks. 2010-01-18 19:55:16 -07:00
Tofu Linden c3ee66d60a Some trivial comment/logging typos that were bothering me more than they needed to. 2010-01-18 14:52:55 -08:00
Tofu Linden d8c6e5b315 trivial comment fix. 2010-01-18 14:22:32 -08:00
Tofu Linden 66f5f2b922 EXT-4470 Several bad assumptions that LL_PATH_PER_SL_ACCOUNT is always good (which it isn't until after login)
To be reviewed by Soft!
2010-01-18 14:07:03 -08:00
Xiaohong Bao 5a672bbcb9 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0 2010-01-15 15:37:47 -08:00
Xiaohong Bao 9d7ad2733e partial fix for EXT-4352: Texture loading problems in Viewer 2.0. More to come later (next week). 2010-01-15 15:36:43 -08:00
angela 433eb89473 EXT-3795 First run messages still display (click & drag on map, Build tools open, movement controlled, etc) 2010-01-14 09:38:46 +08:00
Tofu Linden 52ab1a03f2 EXT-4049 Change About SL window label from ABOUT Second Life to About Second Life 2010-01-08 13:58:48 -08:00
Tofu Linden 0c91cfc49c Lots of fixes to parcel audio playing/stopping/autoplaying/firstuse policy. 2010-01-05 19:04:45 -08:00
James Cook 3c06dc4df2 Merge 2009-12-16 16:40:06 -08:00
Leyla Farazha b76c439983 EXT-2649 Replace 'Advanced > Set Away After 30 Minutes' with Away time options
EXT-2649 [BSI] Confirm on Drop
EXT-3416  Can't name a new gesture on creation (and renaming is HARD)
reviewed by James
2009-12-15 16:25:11 -08:00
Vadim Savchuk e303864c17 Merge from default branch.
Resolved conflicts in llalertdialog.h and llnotify.cpp (local deletion vs
remote change) by removing them.

--HG--
branch : product-engine
2009-12-15 17:14:31 +02:00
brad kittenbrink cee8909ee4 Final merge of precompiled header dependency cleanup work. 2009-12-14 16:53:52 -08:00
richard 36dae1c1a0 merge 2009-12-14 13:07:28 -08:00
brad kittenbrink cb9b874b17 Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0. 2009-12-14 11:07:29 -08:00
Vadim Savchuk f493b62f86 Merge from default branch.
--HG--
branch : product-engine
2009-12-14 15:07:16 +02:00
James Cook fce0d168ae EXT-3233 Button label vertical placement cannot be adjusted via xml
Added bottom_pad attribute to widgets/button.xml and removed old
LLBUTTON_VPAD global and ButtonVPad saved setting.
Reviewed with Richard.
2009-12-11 13:48:35 -08:00
skolb f0da8a7420 Merge media back into viewer 2-0 2009-12-11 09:07:39 -08:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
Monroe Linden 95b044a5c6 Fix for DEV-41388 (SNOW-307: Linux viewer builds renames gstreamer plugin to quicktime.)
Of the four options suggested in the jira, this is a modified version of #2.  Since the mime_types.xml file actually gets localized (it contains a bunch of user-visible text in addition to the mappings), I don't think renaming it in viewer_manifest.py will work.

Instead, I've created additional files (mime_types_linux.xml and mime_types_mac.xml) in the same location, and changed the code that loads the file in LLAppViewer::init() to look for different names per-platform.

I'm sure there are cleverer solutions (such as abusing the translation xml overlay system to create files that have deltas per platform), but those don't fit in the time-box allocated to this issue.
2009-12-10 16:03:39 -08:00
Vadim Savchuk cc6f28432e Merge from default branch.
--HG--
branch : product-engine
2009-12-09 12:47:36 +02:00
Vadim Savchuk d87c492d72 Merge from default branch.
--HG--
branch : product-engine
2009-12-08 15:27:20 +02:00
Yuri Chebotarev d36b993e92 fix low EXT-1112 No critical notification if quiting SL with unsaved group
--HG--
branch : product-engine
2009-12-08 12:53:45 +02:00
Lynx Linden 98111a40ec DEV-43439: Created new LLVersionInfo API.
Renamed llviewerversion to llversioninfo, to avoid confusion with
llversionviewer in llcommon (llversion is already used by llwindow).

Created new LLVersionInfo class with the following methods:

        static S32 getMajor();
        static S32 getMinor();
        static S32 getPatch();
        static S32 getBuild();
        static const std::string &getVersion();
        static const std::string &getShortVersion();
        static const std::string &getChannel();

All viewer code has been updated to use this API. Viewer code no
longer directly includes llversionviewer.h from llcommon.
2009-12-08 14:56:19 +00:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 5352954eb6 automated merge 2010-02-26 17:34:39 -08:00
Roxie Linden 5c73a90835 automated merge 2010-02-25 21:20:45 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
Roxie Linden 0ac14158bc automated merge from trunk 2010-02-25 14:12:18 -08:00
Roxie Linden c6163fafaa automated merge 2010-02-25 01:34:52 -08:00
Roxie Linden c2ca71322b automated merge
Don't wanna fix all windows EOL issue here
warn-on-failure:unix-eol
2010-02-24 19:10:43 -08:00
Lynx Linden 24cba353a4 DEV-43439: Rename llviewerbuild.{cpp|h} -> llviewerversion.{cpp|h}
This module now contains general viewer version routines, not just
access to the viewer build number, so I've renamed it from
llviewerbuild to llviewerversion.
2009-12-07 20:30:29 +00:00