161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
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
ef8bdb5d95
SH-2507 Fix for crash when rendering axes (develop->render->show axes)
2011-11-08 15:15:58 -06:00
f19f43c746
merge
2011-10-19 16:21:18 -05:00
b17023e3b0
SH-2593 Fix for crash when jumping from "Low" to "Ultra" with Debug GL on.
2011-10-19 14:18:49 -05:00
9f45495fc3
Fix for crash when toggling shaders.
2011-10-14 17:56:17 -05:00
7b6723d1e0
SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOs
2011-10-13 01:19:45 -05:00
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
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
40fe25632c
SH-2553 Fix for glitches when rendering HUD attachments.
2011-10-06 15:00:14 -05:00
1f4bc18050
merge
2011-10-05 19:18:58 -05:00
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
8dbfa02277
merge
2011-09-26 18:32:12 -05:00
54ba56dbe9
SH-2244 changes to run in a core context on AMD hardware without generating deprecation or performance warnings
2011-09-26 18:31:55 -05:00
058b79fadd
SH-2244 Fix for menu backgrounds being invisible on login screen when shaders enabled.
2011-09-26 17:19:08 -05:00
4f99ace069
SH-2243 work in progress -- put back ambient lighting when atmospheric shaders disabled.
2011-09-17 00:19:19 -05:00
24ae2fb5af
SH-2243 work in progress -- don't use built-in GL light state when shaders are available.
2011-09-15 16:38:31 -05:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
616a7b549d
fix for VWR-26864: Recent commit to Snowstorm project introduces frequent errors and crashes associated with private memory pool.
2011-09-07 23:23:08 -06:00
749d9ebadc
Merge
2011-08-31 10:48:56 -06:00
7821ff23ba
SH-2242 Physics shape display works again, added asserts to flush out areas where state being consumed by a shader does not match state being provided by vertex buffers.
2011-08-27 00:38:53 -05:00
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
d951267467
Merge from viewer-development
2011-07-15 12:14:34 -06:00
13de92740e
merge latest viewer-development
2011-06-22 11:45:43 -04:00
7d49f7af58
SH-1785 Fix for hud attachments not rendering properly with indexed texture rendering.
2011-06-08 15:31:10 -05:00
53e890f4fd
SH-1359 General octree tune-up -- increase maximum capacity of an octree node and rework requested octree node sizes for minimum triangles per frame and maximum triangles per drawing call.
2011-05-26 20:37:15 -05:00
551d17f819
merge latest changes (post-2.7.0) from viewer-development
2011-05-23 11:38:33 -04:00
51bb3c15c8
SH-469 WIP -- get rid of LLMultiSampleBuffer and use GL_ARB_texture_multisample instead.
2011-05-19 20:38:39 -05:00
dab6d7b507
fix for SH-Render Metadata Physics Shapes on Development Client Gives Black Screen
2011-05-09 16:41:00 -06:00
6bdfc3d048
merge out changes up to but not including the STORM-610 change
2011-04-13 12:03:53 -04:00
1d34e7b90b
Automated merge with http://hg.secondlife.com/viewer-development
2011-04-06 15:20:51 -07:00
5a0547cdc3
STORM-1126 merge
2011-03-31 18:46:56 +03:00
4af9364197
SOCIAL-788 FIX HUD Click points not accurate in Basic mode
...
SOCIAL-789 FIX HUD position and function affected by Destination Guide and Avatar picker panels in Basic mode
2011-03-24 16:40:50 -07:00
3b5d6eed12
merge
2011-04-19 14:55:11 -05:00
92c3107419
fix for SH-1235: [PUBLIC] Select a HUD attachment and moving a child prim or entire linkset crashes viewer
2011-04-11 14:08:01 -06:00
01cdeb0cdd
Merge from viewer-development
2011-02-23 10:44:59 -07:00
8330a4d0fd
Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/
2011-02-19 00:17:12 +00:00
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
cfb3ee50c2
SH-948 don't occlusion cull everything when deferred rendering is enabled
2011-02-18 13:52:40 -06:00
ba4afc4a30
Automated merge up from viewer-development into mesh-development
2011-02-02 16:36:33 -05:00
d3bfbd8ebb
SH-483 Fix for varioius issues with hi-rez snapshots -- mainly disable the ability to take hi-rez snapshots if UI or HUD attachments are in the snapshot, and go back to old tile compositing method instead of using huge framebuffer objects.
2011-02-01 02:06:36 -06:00
32c4a448b1
SH-571 Fix for shadows disappearing for a frame whenever an object switches octree nodes. Regressed EXT-7155 so fix for regression included.
2011-01-19 23:16:53 -06:00
f4ff1430f0
first iteration of memory pool code
2010-12-03 22:16:16 -07:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
cb54738a49
Merge from beta
2010-11-09 16:31:16 -05:00
dc59b268dc
SH-412 -- fix the way that redraws happen to eliminate flickering on resize -- patch from davep and seraph, I'm just applying it.
2010-11-09 15:18:41 -05:00
a5e63b1dc0
Merge
2010-11-08 12:57:26 -05:00
aad22f9faf
SH-281 Fix for snapshots showing interface all the time
2010-11-04 16:35:24 -04:00
ffc07281ad
SH-358 FIXED LLPipeline::renderBloom crash on Windows
2010-11-04 16:30:59 -04:00
Nicky