Commit Graph

219 Commits (14ddfcdf5237c9529d8a8edbd4c86cfd53cfaf78)

Author SHA1 Message Date
merov c294c7c474 CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux 2013-03-16 16:09:50 -07:00
MaksymS ProductEngine d1481a599f MAINT-1486 FIXED Crash on login (Unhandled exception) 2012-08-31 00:38:16 +03:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
Oz Linden 8df3619621 merge to viewer-developmento 2012-07-24 10:51:37 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
Todd Stinson 3f17205889 Some clean-up after checking the differences between the pathfinding branch and viewer-release. 2012-06-26 12:27:08 -07:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Todd Stinson e4aa203881 PATH-702: Positioning the rebake navmesh button to align with the Stand/StopFlying buttons. Also, parenting the buttons to the toolbar UI elements. 2012-06-19 17:20:24 -07:00
prep c839e769e8 Instance checks before using llpathfindingmanager. 2012-06-19 15:34:24 -04:00
prep 6711e6584a path-722: handling the case where region entry or teleporting would cause the rebake button to be drawn ontop of splash screen. 2012-06-19 15:09:22 -04:00
callum 2eedd0c3c0 Merge with tip 2012-06-15 13:00:49 -07:00
Dave Parks b93a23aa82 MAINT-1147 Fix for frame stall on region crossing. 2012-06-13 18:05:56 -05:00
Todd Stinson fbf01e9c2a EXP-1942,EXP-1945: Pulling down the teleport screen in the scenario of waiting for a maturity preference change that is still being posted to the server. 2012-05-29 18:02:38 -07:00
Dave Parks abaf0155b4 MAINT-616 Faster issuance of occlusion queries. 2012-05-25 10:51:38 -05:00
Dave Parks b7cfd8c7f0 MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update 2012-05-21 23:33:25 -05:00
Todd Stinson 2f4ad07633 Cleaning up miscellaneous differences between the pathfinding repository and the latest viewer-development. 2012-03-20 17:38:58 -07:00
prep fab57eea61 pull and merge from viewer-development 2012-03-13 15:48:24 -04:00
prep e5a2e668be Removed unneeded code 2012-03-07 10:44:32 -05:00
prep 34a0a98f9d Partial fix for Path-387. Path-287 Viewer perfomance tweaks. 2012-03-07 10:34:49 -05:00
prep 5f2ed985ab Path-267: Support for rendering of new shape types an ui hookup. 2012-02-27 13:42:14 -05:00
prep 37febbcb7a WIP: navmesh rendering on ultra. Atmospheric shaders still need to be disabled, but navmesh renders on all settings 2012-02-24 16:10:18 -05:00
prep b64773bf2d Fix for nacmesh viewing on low gfx setting and llpathinglib update. 2012-02-24 14:34:53 -05:00
Dave Parks d953cce386 MAINT-775 Cleanup of some weird corner cases on animated child prims. 2012-04-19 17:29:32 -05:00
Todd Stinson e5d59b3c2a Moving the bulk of the display settings into the viewer. 2012-02-14 16:41:53 -08:00
prep ca79e6bb04 merge 2012-02-13 10:11:22 -05:00
prep 6d6c38f216 Path-197. Navmeshes are converted into vbos. 2012-02-13 10:10:57 -05:00
Todd Stinson 11259b37ee PATH-284: Moving files around in preparation for the new pathfinding console design. 2012-02-10 17:34:14 -08:00
Todd Stinson 125bdb31b0 Renaming the pathfinding console to be pathfinding setup. 2012-02-01 17:55:49 -08:00
Todd Stinson a376d6314d PATH-243: Refactoring the implementation for the render mode buttons on the console. Removing the warning messages for methods that now have implementations. 2012-01-31 16:30:16 -08:00
Nyx (Neal Orman) f19a77047d PATH-192 FIX fixed last issues with convex decomp merge 2012-01-27 15:09:20 -05:00
Todd Stinson 5726d13c24 Fixing issue with renamed header file in a pre-built package. 2012-01-25 18:54:00 -08:00
Dave Parks 0bbe8d73cb SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer. 2012-01-25 15:37:36 -06:00
Todd Stinson 496fa2ea87 Changing the camel case of Navmesh to be NavMesh. 2012-01-18 17:23:15 -08:00
prep 22b877e70a WIP: Navmesh vbos rendering fixes (added normal and color maps). 2012-01-05 17:02:22 -05:00
prep e2fd0266ca path-149 overlay of navmesh on onto renderables 2012-01-05 10:20:18 -05:00
prep 06bfbf61e1 Path-177. Updated to newest version of LLPathingLibrary 2012-01-04 13:12:46 -05:00
prep e9058099d0 Allow for the overlaying of an unblended navmesh ontop of the scenes normal renderables 2011-12-20 12:57:32 -05:00
prep 7f8aebf78b Moved navmesh rendering invocation into viewerdisplay. 2011-12-14 16:07:47 -05:00
Leslie Linden 2878b6d1da SH-2713 FIX -- modified code to call LLPipeline::refreshCachedSettings only when settings that could affect it are modified.
Reviewed by davep.
2011-11-23 14:30:30 -08:00
Dave Parks ef8bdb5d95 SH-2507 Fix for crash when rendering axes (develop->render->show axes) 2011-11-08 15:15:58 -06:00
Dave Parks f19f43c746 merge 2011-10-19 16:21:18 -05:00
Dave Parks b17023e3b0 SH-2593 Fix for crash when jumping from "Low" to "Ultra" with Debug GL on. 2011-10-19 14:18:49 -05:00
Dave Parks 9f45495fc3 Fix for crash when toggling shaders. 2011-10-14 17:56:17 -05:00
Dave Parks 7b6723d1e0 SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs 2011-10-13 01:19:45 -05:00
Richard Linden d0cda13235 EXP-1275 FIX A UI element or Keyboard shortcut to clear the viewport
Ctrl+Shift+U now toggles UI and hides floaters
refactored main_view.xml
made all members of llviewerwindow private
2011-10-11 22:49:00 -07:00
Dave Parks 3211c6e308 SH-2240 WIP on removing lots of string comparisons that were added to deal with exploding amounts of non-built-in GL state 2011-10-11 00:26:03 -05:00
Dave Parks 40fe25632c SH-2553 Fix for glitches when rendering HUD attachments. 2011-10-06 15:00:14 -05:00
Dave Parks 1f4bc18050 merge 2011-10-05 19:18:58 -05:00