diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-05-31 17:51:51 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2019-05-31 17:51:51 +0300 |
| commit | 1b793f5c10e9f74d66ccbf0d085e169e61e1a592 (patch) | |
| tree | 47bd6cea4a3c326a14c5077321e481761abf2d0f /indra | |
| parent | 0c84313a000ff3589cef92fb8ba151ee14a51f58 (diff) | |
SL-11323 Bad merge fix and cleanup
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/installers/windows/lang_en-us.nsi | bin | 11488 -> 11434 bytes | |||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 7 |
2 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi Binary files differindex fd4d340816..ea680f08e4 100644 --- a/indra/newview/installers/windows/lang_en-us.nsi +++ b/indra/newview/installers/windows/lang_en-us.nsi diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 053c041849..6e710f053c 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -1775,13 +1775,6 @@ Visit [_URL] for more information? <notification icon="alertmodal.tga" - name="RunLauncher" - type="alertmodal"> - Please do not directly run the viewer executable. Update any existing shortcuts to run SL_Launcher instead. - </notification> - - <notification - icon="alertmodal.tga" name="OldGPUDriver" type="alertmodal"> There is likely a newer driver for your graphics chip. Updating graphics drivers can substantially improve performance. |