Commit Graph

81 Commits (22a851663cddecced21acd88ed8ae4fa9fc733fd)

Author SHA1 Message Date
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Xiaohong Bao d306cb059b a trivial code change for SH-3073. The change makes sure to clear the texture fetching queue ONLY once during a teleporting. 2012-07-23 17:41:21 -06:00
Xiaohong Bao 0730b24d7c fix merge conflicts: v-r to drano 2012-06-26 22:27:24 -06:00
Brad Payne (Vir Linden) 74d4f8af01 v-r to drano merge conflicts wip 2012-06-26 16:43:58 -04:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Xiaohong Bao 0d80aced24 for SH-3073: implement a fast cache system for texture fetching 2012-06-12 17:01:48 -06:00
Merov Linden a99dfeb58b SH-3145 : Expose update fetch and update priorities magic numbers in settings.xml 2012-06-08 19:21:48 -07:00
Xiaohong Bao f25dbddd5b fix for MAINT-1113: [PUBLIC_JIRA_USERS][crashhunters] crash at LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *) [secondlife-bin llviewertexturelist.cpp] 2012-05-31 18:10:32 -06:00
Xiaohong Bao 957bfcd5d9 fo SH-3074: clear ghost and stale texture fetching requests in time. 2012-05-29 18:02:11 -06:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Xiaohong Bao e65852e9a5 For SH-3086: add functions to refetch all previous textures through HTTP and from cache 2012-05-03 11:38:05 -06:00
Xiaohong Bao 0a42495906 for SH-3074: clear ghost and stale texture fetching requests in time 2012-04-12 15:50:25 -06:00
Merov Linden 91094d92a7 SH-3060 : Implement new byte range computation, cleaned up use of compression rate as well. 2012-04-05 22:05:00 -07:00
Dave Parks 5ef21ba6c5 MAINT-775 More edge case cleanup -- spinning child prims still break on deselect until the next LoD update 2012-04-20 00:58:55 -05:00
Dave Parks 06bd745027 MAINT-775 More aggressive removal of textures from video memory. 2012-04-18 14:50:23 -05:00
Dave Parks cd468364a7 MAINT-708 Don't compress UI textures. Use GL_NICEST as compression hint to avoid artifacts. 2012-03-07 17:26:43 -06:00
Xiaohong Bao 7fe5cbc5c2 trivial: some debug code for SH-2623: [PUBLIC_JIRA_USERS][crashhunters] crash at LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *) 2011-12-22 10:44:49 -07:00
Oz Linden b69be18d7b merge changes for vmrg-193 2011-11-24 06:56:57 -05:00
Xiaohong Bao 02554b7482 trivial: fix a linux compiling warning. 2011-11-04 17:34:39 -06:00
Brad Payne (Vir Linden) 51c7887f8d merge 2011-10-31 11:35:22 -04:00
Xiaohong Bao db363104dc fix for SH-2586: Texture Memory (MB) preference refuses to set above 128mb (when --noprobe switch is used) 2011-10-26 14:35:58 -06:00
Xiaohong Bao 67c7749624 debug code for SH-2623: crash at LLViewerTextureList::removeImageFromList() 2011-10-25 17:48:37 -06:00
Xiaohong Bao dbb353d3b0 fix for SH-2516: Full Bright Geometry Rendering Increases Rapidly, Destroying Frame Rate. 2011-10-21 11:53:29 -06:00
Dave Parks f19f43c746 merge 2011-10-19 16:21:18 -05:00
Dave Parks 967479f903 SH-2031 Fix for stall in image update -- don't use the CPU to convert a height map into a normal map -- use the GPU instead via a shader. Also, WTF glFinish? 2011-10-05 15:12:02 -05:00
Richard Nelson 63a8fce12b made toolbars conform to visual specs
added ability to specify clip rects in textures.xml
2011-09-30 18:51:17 -07:00
Dave Parks 6469f1c2f2 SH-2031 High risk changeset, but potentially high reward. Addresses frame stalls in renderer by never using the fixed function pipeline if shaders are available. 2011-07-17 00:24:08 -05:00
Xiaohong Bao cff4c6e885 fix for SH-1642: [PUBLIC_JIRA_USERS][crashhunters] crash at LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *) [secondlife-bin llviewertexturelist.cpp] 2011-06-21 16:58:55 -06:00
Xiaohong Bao 75bdb77c24 more fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307) 2011-06-03 10:55:28 -06:00
Xiaohong Bao b100f1d2d4 fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307) 2011-06-01 12:09:40 -06:00
Xiaohong Bao 8c97ed86ff fix for SH-1624: Crash during viewer startup: LLViewerTextureList::addImageToList 2011-05-25 14:38:53 -06:00
Oz Linden ecafe4d8ab fix more DOS line endings 2011-05-20 17:19:03 -04:00
Dave Parks 8a92612fd9 merge 2011-05-16 12:34:15 -05:00
Dave Parks 93696ac019 merge 2011-05-12 17:39:08 -05:00
Richard Linden e18f200243 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2011-05-12 11:38:32 -07:00
Oz Linden ba568b8945 y 2011-05-11 20:07:36 -04:00
Xiaohong Bao 2a61d908e7 Merge 2011-05-10 13:57:41 -06:00
Merov Linden c03eb76bcf EXP-664 : Fix call to initialization encoding 2011-05-04 23:20:15 -07:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Merov Linden 1ef083244a EXP-664 : Add JPEG2000 compression settings for test, fix one crash on compression, enhanced error handling on image upload 2011-04-25 22:37:15 -07:00
Merov Linden 759d72a46c EXP-669 : Refactor code to use correct LLImageFormatted methods to load images of all formats, reviewed by richard 2011-04-13 14:05:31 -07:00
Xiaohong Bao e32d1cf756 fix for STORM-973: [crashhunters] crash at LLViewerTextureList::removeImageFromList(LLViewerFetchedTexture *) 2011-04-05 15:28:18 -06:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Don Kjer 774405e92b Cleanup of headless client (was: DisableRendering mode)
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode.  This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
Xiaohong Bao 961e50aab4 clear some LLPointer issues for SH-694: check if there are any other LLPointer issues in the mesh model uploading flow and fix them if exist. 2011-01-04 16:22:38 -07:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Richard Nelson 52d3f86438 fixed merging of textures.xml between current skin and base
now possible to define new textures in current skin
2010-10-04 18:39:09 -07:00
Loren Shih d65e512fa3 Automated merge up from viewer-development 2010-10-04 11:21:18 -04:00
Richard Linden 0edb695ea8 instead of exposing mutable container in LLInitParam::Multiple, just expose access functions, begin(), end(), etc.
this allows mutation of param block contents, without being able to change number of elements
2010-09-22 14:48:18 -07:00
Xiaohong Bao fcdd09772f debug code for SH-115: investigate texture related network traffic between viewer 2.x and 1.23. 2010-09-16 13:13:06 -06:00