3c2db0d179
Automated merge
2010-12-02 12:07:32 -05:00
d06c9fba90
SH-437 Fix for crash when setting RenderGlow to FALSE when deferred rendering is on.
2010-12-02 01:23:46 -06:00
f18c381d1a
Fixes for viewer-development merge into viewer-mesh.
...
Manually merged llappviewer and viewer_manifest.py.
2010-12-01 18:05:25 -05:00
3083830d21
merge
2010-12-01 17:00:42 -06:00
398b392dc0
SH-391 Do some bounds checking on texture entry indices when aligning planar faces.
2010-12-01 17:00:22 -06:00
7738548af8
Add GTX 580 to GPU table.
2010-12-01 16:59:43 -06:00
447e697e33
Still fixing non-windows builds
2010-12-01 15:01:06 -05:00
3a40bdbe52
Fixing linux build failure
2010-12-01 13:22:45 -05:00
1e49e9ae32
Moving timer code for AMD issue diagnosis
2010-12-01 13:08:09 -05:00
ab90995a6c
Manual fixes for merge-up errors from viewer-development.
2010-12-01 12:57:01 -05:00
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
ed64630a67
Use architecture-independent code for windows fast timers
2010-11-30 15:38:19 -05:00
b778ba9b88
Automated merge from viewer-development
2010-11-30 11:03:39 -05:00
e67e5cbc40
SH-435 FIXED Crash on login from infinite loop in LLVOAvatarSelf
...
Added additional check to prevent infinite loop.
Blind fix since we have no repro.
2010-11-30 10:54:36 -05:00
7166b4009f
Ditch fake anti-aliasing for deferred rendering.
2010-11-30 04:26:44 -06:00
d5227c6dd1
merge
2010-11-30 00:26:17 -06:00
88ed5581d5
Far focal plane blur attenuation tweak.
2010-11-30 00:26:02 -06:00
bd8d888cea
Make importer use 3-light setup all the time
2010-11-30 00:25:44 -06:00
f62a702c2b
Pull viewer-beta into viewer-development
2010-11-29 17:57:29 -08:00
38516a16e4
CHOP-223 : Pull into viewer-beta
2010-11-29 17:08:07 -08:00
05b7ee4a9b
Fix UpdaterServiceURL setting default. update.secondlife.com requires https access.
2010-11-29 17:00:28 -08:00
00e19205e9
CHOP-223 : Pull into viewer-beta
2010-11-29 16:57:02 -08:00
ece58a9dc0
STORM-672 : Fix duplicated name in Pref panel
2010-11-29 16:22:24 -08:00
ee981dd581
CHOP-223 fix for more mac build breakage from the previous changes.
2010-11-29 16:22:20 -08:00
7c287011f9
CHOP-223 fix for mac build breakage introduced in the last change.
2010-11-29 15:49:48 -08:00
76ba60db0b
Better fix for CHOP-223.
...
Comments on the mercurial bug tracker indicate that this bug is likely to
recur, so we work around it in viewer_manifest.py now.
http://mercurial.selenic.com/bts/issue1802
2010-11-29 15:19:52 -08:00
b6dc4a4bf1
Automated merge with https://hg.secondlife.com/mesh-development
2010-11-29 17:21:12 -05:00
94770bbb3f
SH-531 / CTS-324 FIX fix of VWR-20749 / SNOW-624 lost in merge
...
Re-applied fix originally committed in 1e93695ded30
Reveiewed code, appears straightforward.
2010-11-29 17:21:03 -05:00
1664e05527
Attempted fix for CHOP-223: fixed executable permissions on update_install script for mac and linux.
2010-11-29 14:12:56 -08:00
992f6bd4cc
Pull viewer-beta into viewer-development
2010-11-29 13:44:53 -08:00
32d496e472
removed scrub_host_name
2010-11-29 16:24:52 -05:00
36e51f040a
STORM-344 : Pull into viewer-beta
2010-11-29 12:41:56 -08:00
8a2c92aeac
STORM-498 : Pull into viewer-development
2010-11-29 12:38:36 -08:00
93cb03d9d5
STORM-530 : Pull into viewer-beta
2010-11-29 12:32:15 -08:00
826071ef59
STORM-666 : pull into viewer-development
2010-11-29 11:27:02 -08:00
bc7de09e25
merge
2010-11-29 11:55:12 -06:00
689555fda2
Get rid of some redudnant calls to constructUrl
2010-11-29 11:54:58 -06:00
afa2999f06
Tweak DoF bloom gradient.
2010-11-29 11:54:34 -06:00
19ced614ad
merge
2010-11-29 10:48:19 -05:00
c4c727fd7a
STORM-498 FIXED reshaping dockable floater to ensure there is some vertical space between a floater and a control to which it is docked.
2010-11-27 00:15:59 +02:00
de0dbe5739
STORM-530 FIXED Combobox drop down menu appears upon 'Down Arrow' key press even if last combobox item is selected.
2010-11-25 20:06:44 +02:00
2b39cf6c2d
STORM-344 FIXED Fixed Speak button label shrinking when bottom bar has enough space for displaying full Speak label.
...
Bug was caused by counting only width added by last resize as usable for Speak button extending, so widening viewer window by few pixels many times when Speak is shrink would never let it expand regardless of available space.
- Added check for possible chiclet panel shrinking width- cause spare space goes to it when extending. If there is enough space to give from chiclets to Speak, Speak is extended.
2010-11-25 17:51:33 +02:00
65b3cd14ca
Turn off use of new codeticket for now...
2010-11-25 00:44:40 -08:00
d524cf98c7
SH-481 FIX linux build is over 200 MB
...
A previous merge in our move to the public branch cut out the binary strip
command from viewer_manifest.py. Putting it back in to restore small binaries.
2010-11-24 17:09:33 -05:00
2f83766bb7
STORM-500 : pull to viewer-development
2010-11-24 14:05:14 -08:00
1a60b4448d
STORM-491 : pull to viewer-development
2010-11-24 14:04:03 -08:00
12e4bdd4d6
STORM-479 : pull to viewer-development
2010-11-24 14:02:35 -08:00
3d9c05f339
STORM-375 : pull into viewer-development
2010-11-24 14:01:15 -08:00
2e46db239f
Pull from viewer-beta
2010-11-24 13:57:22 -08:00
d9e2d4de48
STORM-667 : pull to viewer-beta
2010-11-24 13:47:35 -08:00
Loren Shih