summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2010-04-20merge from viewer-trunkTofu Linden
2010-04-19mergeBrad Payne (Vir Linden)
2010-04-19For EXT-6809 - fixes suggested by Nyx code reviewBrad Payne (Vir Linden)
2010-04-19mergeBrad Payne (Vir Linden)
2010-04-19trivial comment fix.Tofu Linden
2010-04-19Change Linux fasttimer implementation back to RDTSC - using a reliable ↵Tofu Linden
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-16For EXT-6809 - search static VFS for all asset typesBrad Payne (Vir Linden)
2010-04-19merge from viewer-trunkTofu Linden
2010-04-12slightly conflicty merge from viewer-trunk, againTofu Linden
2010-04-12(slightly hairy) merge from viewer-hotfixTofu Linden
2010-04-09the first round of the debug code for EXT-6792: Crash on ATI 3200Xiaohong Bao
2010-04-07Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-07fix for all wierd crashes happening to lltexturecache.cpp, cuased by running ↵Xiaohong Bao
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-09merge from viewer-trunkTofu Linden
2010-04-07Backed out changeset 63b699f90efdTofu Linden
2010-04-01Automated MergeRoxie Linden
2010-03-29mergeRichard Nelson
2010-03-29EXT-3258 - Viewer freezes while external web browser loads pageRichard Nelson
reviewed by Callum
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
No longer explicitly deleting gAgentAvatarp due to reference counting.
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Fix for cleaning up gAgentAvatar on app shutdown.
2010-03-29MergeLoren Shih
2010-03-29EXT-6536 : Make LLVOAvatarSelf a singletonLoren Shih
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29For EXT-4666: changed LLGestureManager to LLGestureMgr throughoutBrad Payne (Vir Linden)
2010-03-26Implemented central storage mechanism for media plugin cookies.Monroe Linden
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-25automated mergeLoren Shih
2010-03-25Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-03-25more fix for EXT-5711: Some textures loading from cache seems jammed.Xiaohong Bao
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-04-07fix for all wierd crashes happening to lltexturecache.cpp, cuased by running ↵Xiaohong Bao
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-03-25more fix for EXT-5711: Some textures loading from cache seems jammed.Xiaohong Bao
and possible fix for EXT-5704: FPS drop, and this could be cause freez and crash.
2010-03-25EXT-2959 : Pull out camera functions from llagent to llagentcameraLoren Shih
#3 checkin. Took out llagent "friend llagentcamera" and added accessors instead. Did some superficial formatting cleanup.
2010-03-24EXT-2959 : Pull out camera functions from llagent to llagentcameraLoren Shih
#2 checkin. Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
First check-in; only compiles, nothing more.
2010-03-22Weekly automated merge from viewer 2.0Roxie Linden
2010-03-18mergeIgor Borovkov
--HG-- branch : product-engine
2010-03-18mergeIgor Borovkov
--HG-- branch : product-engine
2010-03-18Backed out changeset 0305673fe81e EXT-4820 [NUX] Viewer dimensions on first-runIgor Borovkov
--HG-- branch : product-engine
2010-03-18Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on ↵Igor Borovkov
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-18Backed out changeset 2624e0d8b6f4Igor Borovkov
--HG-- branch : product-engine
2010-03-16fixed EXT-4820 [NUX] Viewer dimensions on first-runIgor Borovkov
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-16Fixed bug EXT-6007 ([STRING IN EN] - While loading Second Life several ↵Vadim Savchuk
messages need to be localized). Reviewed by Richard: https://codereview.productengine.com/secondlife/r/31/ --HG-- branch : product-engine
2010-03-08automated mergeRoxie Linden
2010-03-08DEV-45976 Last Login Location Preference not rememberedRoxie Linden
2010-03-07PE merge.Tofu Linden
2010-03-05mergeRichard Linden
2010-03-05Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved ↵Eugene Mutavchi
LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux. --HG-- branch : product-engine
2010-03-05Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Xiaohong Bao
2010-03-04fix for EXT-5683: viewer crashes at llcommon/llworkerthread.cpp(323): ERROR: ↵Xiaohong Bao
LLWorkerClass::checkWork: ASSERT(workreq).
2010-03-04partitial fix for major EXT-4820 [NUX] Viewer dimensions on first-runYchebotarev ProductEngine
need to specify desctop width and height for macos and linux (see LLDesctopInfo in llsys.cpp for details) --HG-- branch : product-engine
2010-03-02initial work changing topctrl to popup layerRichard Nelson
2010-02-23mergePalmer Truelson