From f89f19990cbb9f3f2e7473ac6c159098bdfabec7 Mon Sep 17 00:00:00 2001 From: Mark Palange Date: Fri, 7 Nov 2008 17:51:03 +0000 Subject: QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release --- indra/newview/app_settings/settings.xml | 108 +++++++++++++++------ .../shaders/class1/objects/simpleV.glsl | 2 +- 2 files changed, 80 insertions(+), 30 deletions(-) (limited to 'indra/newview/app_settings') diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 72e16ea70c..4d4ce6c326 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -1838,17 +1838,6 @@ 0 - CompressSnapshotsToDisk - - Comment - Compress snapshots saved to disk (Using JPEG 2000) - Persist - 1 - Type - Boolean - Value - 0 - ConnectAsGod Comment @@ -2660,6 +2649,22 @@ 0 + FloaterBeaconsRect + + Comment + Rectangle for beacon and highlight controls + Persist + 1 + Type + Rect + Value + + 200 + 250 + 250 + 200 + + FloaterBuildOptionsRect Comment @@ -4279,10 +4284,11 @@ Value 0.0.0 - LastSnapshotHeight + + LastSnapshotToEmailHeight Comment - The height of the last snapshot, in px + The height of the last email snapshot, in px Persist 1 Type @@ -4290,21 +4296,32 @@ Value 768 - LastSnapshotType + LastSnapshotToEmailWidth Comment - Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image) + The width of the last email snapshot, in px Persist 1 Type S32 Value - 0 + 1024 - LastSnapshotWidth + LastSnapshotToDiskHeight Comment - The width of the last snapshot, in px + The height of the last disk snapshot, in px + Persist + 1 + Type + S32 + Value + 768 + + LastSnapshotToDiskWidth + + Comment + The width of the last disk snapshot, in px Persist 1 Type @@ -4312,6 +4329,39 @@ Value 1024 + LastSnapshotToInventoryHeight + + Comment + The height of the last texture snapshot, in px + Persist + 1 + Type + S32 + Value + 512 + + LastSnapshotToInventoryWidth + + Comment + The width of the last texture snapshot, in px + Persist + 1 + Type + S32 + Value + 512 + + LastSnapshotType + + Comment + Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image) + Persist + 1 + Type + S32 + Value + 0 + LeftClickShowMenu Comment @@ -4488,17 +4538,6 @@ Value 20.0 - MainloopTimeoutDefault - - Comment - Timeout duration for mainloop lock detection, in seconds. - Persist - 1 - Type - F32 - Value - 10.0 - MapOverlayIndex Comment @@ -6066,6 +6105,17 @@ Value 1.3 + RenderGround + + Comment + Determines whether we can render the ground pool or not + Persist + 1 + Type + Boolean + Value + 1 + RenderHUDInSnapshot Comment diff --git a/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl b/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl index 0df89c8fc3..78b96b3025 100644 --- a/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl +++ b/indra/newview/app_settings/shaders/class1/objects/simpleV.glsl @@ -11,7 +11,7 @@ void calcAtmospherics(vec3 inPositionEye); void main() { //transform vertex - gl_Position = ftransform(); //gl_ModelViewProjectionMatrix * gl_Vertex; + gl_Position = ftransform(); gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0; vec4 pos = (gl_ModelViewMatrix * gl_Vertex); -- cgit v1.2.3