livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,734 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

16734 Commits (13705596af001078d185dfe5aa7e98d9642f8c8a)

Author SHA1 Message Date
Loren Shih 13705596af Automated merge up from viewer-development into mesh-development 2011-03-14 12:03:14 -04:00
Oz Linden b7635b6112 pull transplanted crash fix changesets back from viewer-release 2011-03-13 08:57:53 -04:00
Merov Linden 522af96aca STORM-1001 : pull into viewer-development 2011-03-11 16:05:27 -08:00
Merov Linden 4790944923 STORM-1067 : pull into viewer-development 2011-03-11 16:04:17 -08:00
Merov Linden 8c20875323 STORM-1059 : pull into viewer-development 2011-03-11 16:02:40 -08:00
Merov Linden 22946d446e STORM-1073 : pull into viewer-development 2011-03-11 16:01:21 -08:00
Merov Linden d550a7e8bc STORM-1020 : pull into viewer-development 2011-03-11 15:57:57 -08:00
Merov Linden 16443c4df3 STORM-1001 : Fix ObjectMedia cap flooding (Fix by Kitty Barnett) 2011-03-11 15:09:44 -08:00
Dave Parks 8903578344 merge 2011-03-11 16:39:24 -06:00
Dave Parks bcc54d4964 SH-477 Put estimated streaming cost back in the debug display -- use newfangled equation. 2011-03-11 16:39:03 -06:00
Merov Linden 005da00fff STORM-1059 : Fix for cache purging (fix by Aleric) 2011-03-11 14:38:09 -08:00
Loren Shih c208593cdc Automated merge up from viewer-development into mesh-development 2011-03-11 12:05:41 -05:00
Oz Linden 1426765e82 increment version to 2.5.3 2011-03-10 20:27:45 -05:00
Oz Linden c556efbce8 increment patch release 2011-03-10 20:21:40 -05:00
Oz Linden ca55bce3ab correct merge error in llviewerobjectlist.cpp 2011-03-10 19:14:42 -05:00
Oz Linden df633558e4 add parameters for pre-release repo 2011-03-10 16:42:07 -05:00
Ricky Curtice c790866e46 Corrected a call to the mac-specific command "Rez" that had the wrong case. This is only an issue on Macs that have a case-sensitive root filesystem. 2011-03-10 12:06:59 -08:00
Oz Linden 57c5d47401 pull 2.5.1 tag back from viewer-release 2011-03-10 13:40:36 -05:00
Loren Shih 250cc9c956 Automated merge up from viewer-development into mesh-development 2011-03-10 13:32:22 -05:00
prep fb00d28040 merge 2011-03-10 13:04:36 -05:00
Dave Parks e3e12bc3df SH-874 Followup -- fix for mac build 2011-03-10 11:55:46 -06:00
Dave Parks 666f06eace SH-874 Followup -- use GL_NVX_gpu_memory_info for NVIDIA chips to detect actual installed and available VRAM. 2011-03-10 11:46:16 -06:00
prep 55dbd0c4f3 merge 2011-03-10 12:10:29 -05:00
prep 79664c1017 Fix for sh-1119: Alt Zooming on assets that contain a pivot point can at times cause erratic camera movement 2011-03-10 12:09:29 -05:00
Dave Parks ca610bfc82 merge 2011-03-10 00:42:08 -06:00
Dave Parks 5fd953df8f SH-874 Properly detect available video memory on ATI cards and disable vertex buffer objects when available vram is under 256MB. 2011-03-10 00:41:46 -06:00
Dave Parks 9044526994 SH-755 Set physics shape type to convex hull on delink if physics shape type was none. 2011-03-10 00:10:25 -06:00
Dave Parks a135831c84 SH-632 Fix for inconsistent decimation results and off by one errors causing decimations where none are needed. 2011-03-09 23:15:31 -06:00
Dave Parks c2bdb9be14 SH-706 Make triangle limit and error threshold spinners respond to arrow clicks. 2011-03-09 18:19:12 -06:00
Dave Parks a0ddc7e80f Make a debug output report proper pool names. 2011-03-09 17:10:02 -06:00
Dave Parks 713366477d Fix for texture state corruption when rendering impostors in a reflection map or underwater and deferred rendering is enabled. 2011-03-09 17:09:35 -06:00
Dave Parks 85f099a868 SH-1063 Fix for some rigged attachments preventing avatars from impostoring (don't let rigged attachments stretch avatar bounding box beyond avatar skeleton). 2011-03-09 17:08:52 -06:00
Dave Parks ff37381e8a merge 2011-03-09 14:18:59 -06:00
Dave Parks d1a2ce75e2 SH-587 Make cancel button on physics tabs more responsive. 2011-03-09 14:18:39 -06:00
Merov Linden 0c02401498 Crash hunters: pull in viewer-development 2011-03-09 11:56:34 -08:00
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -05:00
Merov Linden 075b1af62a STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error) 2011-03-08 17:00:39 -08:00
Merov Linden 76a325b832 STORM-1026 : Suppress trivial assert that makes Mac build fail (warning treated as error) 2011-03-08 17:00:39 -08:00
Xiaohong Bao 7e7ea1eec4 fix for STORM-1053: crash at LLTextureCache::writeToCache 2011-03-08 14:59:40 -07:00
Xiaohong Bao 55694cb241 fix for STORM-1053: crash at LLTextureCache::writeToCache 2011-03-08 14:59:40 -07:00
Xiaohong Bao d4c0c81c72 fix for STORM-1052: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138 2011-03-08 14:20:14 -07:00
Xiaohong Bao 9f765cdb13 fix for STORM-1052: crash at LLVOCacheEntry::~LLVOCacheEntry() line 138 2011-03-08 14:20:14 -07:00
Dave Parks 94b0ce6d84 Make DoF focal point match behavior described in test plan at http://wiki.secondlife.com/wiki/Depth_of_Field_test 2011-03-08 14:15:24 -06:00
Dave Parks 00c861f967 SH-1085 Fix for crash when disabling "mirror" and a face is selected. 2011-03-08 14:14:33 -06:00
Xiaohong Bao 913f927fc8 fix for STORM-1049: [crashhunters] crash at LLViewerFetchedTexture::forceToSaveRawImage(int,bool) 2011-03-08 11:52:28 -07:00
Xiaohong Bao b319e25598 fix for STORM-1049: [crashhunters] crash at LLViewerFetchedTexture::forceToSaveRawImage(int,bool) 2011-03-08 11:52:28 -07:00
Xiaohong Bao da82bccd17 Automated merge with http://hg.secondlife.com/viewer-development 2011-03-07 18:10:42 -07:00
Xiaohong Bao 409cc0cf93 fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion 
STORM-1014: Viewer crash in LLSurface::getWaterHeight
STORM-1047:[crashhunters] crash at LLViewerObjectList::renderObjectsForMap
 2011-03-07 18:10:28 -07:00
Xiaohong Bao e841d62f81 fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion 
STORM-1014: Viewer crash in LLSurface::getWaterHeight
STORM-1047:[crashhunters] crash at LLViewerObjectList::renderObjectsForMap
 2011-03-07 18:10:28 -07:00
Xiaohong Bao 1405bbd81e fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion 
STORM-1014: Viewer crash in LLSurface::getWaterHeight
STORM-1047:[crashhunters] crash at LLViewerObjectList::renderObjectsForMap
 2011-03-07 18:10:28 -07:00