diff options
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 108 | ||||
| -rw-r--r-- | indra/newview/app_settings/shaders/class1/objects/simpleV.glsl | 2 |
2 files changed, 80 insertions, 30 deletions
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 @@ <integer>0</integer> </array> </map> - <key>CompressSnapshotsToDisk</key> - <map> - <key>Comment</key> - <string>Compress snapshots saved to disk (Using JPEG 2000)</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>Boolean</string> - <key>Value</key> - <integer>0</integer> - </map> <key>ConnectAsGod</key> <map> <key>Comment</key> @@ -2660,6 +2649,22 @@ <integer>0</integer> </array> </map> + <key>FloaterBeaconsRect</key> + <map> + <key>Comment</key> + <string>Rectangle for beacon and highlight controls</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Rect</string> + <key>Value</key> + <array> + <integer>200</integer> + <integer>250</integer> + <integer>250</integer> + <integer>200</integer> + </array> + </map> <key>FloaterBuildOptionsRect</key> <map> <key>Comment</key> @@ -4279,10 +4284,11 @@ <key>Value</key> <string>0.0.0</string> </map> - <key>LastSnapshotHeight</key> + + <key>LastSnapshotToEmailHeight</key> <map> <key>Comment</key> - <string>The height of the last snapshot, in px</string> + <string>The height of the last email snapshot, in px</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -4290,21 +4296,32 @@ <key>Value</key> <integer>768</integer> </map> - <key>LastSnapshotType</key> + <key>LastSnapshotToEmailWidth</key> <map> <key>Comment</key> - <string>Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)</string> + <string>The width of the last email snapshot, in px</string> <key>Persist</key> <integer>1</integer> <key>Type</key> <string>S32</string> <key>Value</key> - <integer>0</integer> + <integer>1024</integer> </map> - <key>LastSnapshotWidth</key> + <key>LastSnapshotToDiskHeight</key> <map> <key>Comment</key> - <string>The width of the last snapshot, in px</string> + <string>The height of the last disk snapshot, in px</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>768</integer> + </map> + <key>LastSnapshotToDiskWidth</key> + <map> + <key>Comment</key> + <string>The width of the last disk snapshot, in px</string> <key>Persist</key> <integer>1</integer> <key>Type</key> @@ -4312,6 +4329,39 @@ <key>Value</key> <integer>1024</integer> </map> + <key>LastSnapshotToInventoryHeight</key> + <map> + <key>Comment</key> + <string>The height of the last texture snapshot, in px</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>512</integer> + </map> + <key>LastSnapshotToInventoryWidth</key> + <map> + <key>Comment</key> + <string>The width of the last texture snapshot, in px</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>512</integer> + </map> + <key>LastSnapshotType</key> + <map> + <key>Comment</key> + <string>Select this as next type of snapshot to take (0 = postcard, 1 = texture, 2 = local image)</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>S32</string> + <key>Value</key> + <integer>0</integer> + </map> <key>LeftClickShowMenu</key> <map> <key>Comment</key> @@ -4488,17 +4538,6 @@ <key>Value</key> <real>20.0</real> </map> - <key>MainloopTimeoutDefault</key> - <map> - <key>Comment</key> - <string>Timeout duration for mainloop lock detection, in seconds.</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>F32</string> - <key>Value</key> - <real>10.0</real> - </map> <key>MapOverlayIndex</key> <map> <key>Comment</key> @@ -6066,6 +6105,17 @@ <key>Value</key> <real>1.3</real> </map> + <key>RenderGround</key> + <map> + <key>Comment</key> + <string>Determines whether we can render the ground pool or not</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>1</integer> + </map> <key>RenderHUDInSnapshot</key> <map> <key>Comment</key> 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); |