7f0a778990
merge
2010-04-19 13:53:57 -04:00
aa5e494e0c
For EXT-6809 - fixes suggested by Nyx code review
2010-04-19 13:52:59 -04:00
c5e338f240
merge
2010-04-19 10:13:49 -04:00
80ebd31ac4
trivial comment fix.
2010-04-19 13:08:33 +01:00
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
142f867d38
For EXT-6809 - search static VFS for all asset types
2010-04-16 16:06:34 -04:00
9fbe736774
(slightly hairy) merge from viewer-hotfix
2010-04-12 11:03:16 +01:00
d64ccab573
the first round of the debug code for EXT-6792: Crash on ATI 3200
2010-04-09 23:48:50 -06:00
5aa6abb6be
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-04-07 11:54:03 -06:00
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
0bb3f144c0
Backed out changeset 63b699f90efd
2010-04-07 10:37:07 +01:00
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
eeeca91797
merge
2010-03-29 15:29:12 -07:00
e50586043b
EXT-3258 - Viewer freezes while external web browser loads page
...
reviewed by Callum
2010-03-29 15:28:48 -07:00
fbdd93bb91
EXT-6536 : Make LLVOAvatarSelf a singleton
...
No longer explicitly deleting gAgentAvatarp due to reference counting.
2010-03-29 14:45:21 -04:00
0ffc73855b
EXT-6536 : Make LLVOAvatarSelf a singleton
...
Fix for cleaning up gAgentAvatar on app shutdown.
2010-03-29 13:50:37 -04:00
b6e7850c0a
Merge
2010-03-29 12:30:09 -04:00
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
b2a667b722
For EXT-4666: changed LLGestureManager to LLGestureMgr throughout
2010-03-29 11:10:54 -04:00
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
0a56031bd3
automated merge
2010-03-25 20:15:51 -04:00
fad31dc087
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-03-25 17:46:36 -06:00
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
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
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
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
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
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
18b7ab0018
Weekly automated merge from viewer 2.0
2010-03-22 16:12:41 -07:00
33746d7c73
merge
...
--HG--
branch : product-engine
2010-03-18 16:43:11 +02:00
11e4b42ec9
merge
...
--HG--
branch : product-engine
2010-03-18 16:38:44 +02:00
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
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
ec3443cc85
Backed out changeset 2624e0d8b6f4
...
--HG--
branch : product-engine
2010-03-18 16:27:34 +02:00
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
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
20379fecd9
automated merge
2010-03-08 21:39:38 -08:00
8bd5a3bca3
DEV-45976 Last Login Location Preference not remembered
2010-03-08 15:10:27 -08:00
0775e91901
PE merge.
2010-03-07 15:27:17 +00:00
931ff555bd
merge
2010-03-05 14:46:00 -08:00
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
d33b6a1887
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 09:15:18 -07:00
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
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
41a30a59fb
initial work changing topctrl to popup layer
2010-03-02 14:21:58 -08:00
0980df1e0c
merge
2010-02-23 17:07:18 -08:00
da79eb5545
Turning on Davep optimizations again. Backed out changeset d89b00b44ab6
2010-02-23 16:48:49 -08:00
2d00beeed2
Backed out cpp changes from changeset 49e628c3a0c5
2010-02-18 20:36:03 -05:00
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
3b8463f0fd
merge
2010-02-12 21:06:25 -08:00
Brad Payne (Vir Linden)