diff options
| author | McCabe Maxsted | 2009-06-13 03:59:22 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-13 03:59:22 -0700 |
| commit | 82d07354266994d7d6b86192ef8f9c7c5ed1c8eb (patch) | |
| tree | ae1f582267533b0781c2b0cb520b94ca28dce9db | |
| parent | Moved mini-map tooltips to XML, added panning tooltip (diff) | |
| download | meta-impy-82d07354266994d7d6b86192ef8f9c7c5ed1c8eb.zip meta-impy-82d07354266994d7d6b86192ef8f9c7c5ed1c8eb.tar.gz meta-impy-82d07354266994d7d6b86192ef8f9c7c5ed1c8eb.tar.bz2 meta-impy-82d07354266994d7d6b86192ef8f9c7c5ed1c8eb.tar.xz | |
Removed double click tp checkbox from preferences as it keeps the two maps more in sync, and Show Map is in the minimap now. Keeping the debug setting.
| -rw-r--r-- | ChangeLog.txt | 6 | ||||
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 4c9a14c..f529acd 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
| @@ -12,6 +12,12 @@ | |||
| 12 | modified: linden/indra/newview/llnetmap.cpp | 12 | modified: linden/indra/newview/llnetmap.cpp |
| 13 | modified: linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml | 13 | modified: linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml |
| 14 | modified: linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml | 14 | modified: linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml |
| 15 | |||
| 16 | |||
| 17 | * Removed double click tp checkbox from preferences as it keeps the two maps more in sync, | ||
| 18 | and Show Map is in the minimap now. Keeping the debug setting. | ||
| 19 | |||
| 20 | modified: linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml | ||
| 15 | 21 | ||
| 16 | 22 | ||
| 17 | 2009-06-12 McCabe Maxsted <hakushakukun@gmail.com> | 23 | 2009-06-12 McCabe Maxsted <hakushakukun@gmail.com> |
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml index 6c8ffdb..ea04dfc 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml | |||
| @@ -77,10 +77,6 @@ | |||
| 77 | font="SansSerifSmall" height="16" initial_value="false" | 77 | font="SansSerifSmall" height="16" initial_value="false" |
| 78 | label="Rotate Mini-Map" left="151" mouse_opaque="true" | 78 | label="Rotate Mini-Map" left="151" mouse_opaque="true" |
| 79 | name="rotate_mini_map_checkbox" radio_style="false" width="256" /> | 79 | name="rotate_mini_map_checkbox" radio_style="false" width="256" /> |
| 80 | <check_box bottom="-286" control_name="MiniMapTeleport" enabled="true" follows="left|top" | ||
| 81 | font="SansSerifSmall" height="16" initial_value="false" | ||
| 82 | label="Doubleclick Mini-Map Teleports" left="280" mouse_opaque="true" | ||
| 83 | name="teleport_mini_map_checkbox" radio_style="false" width="256" /> | ||
| 84 | <check_box bottom="-304" enabled="true" | 80 | <check_box bottom="-304" enabled="true" |
| 85 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" | 81 | follows="left|top" font="SansSerifSmall" height="16" initial_value="false" |
| 86 | label="Notify when Linden dollars (L$) spent or received" left="151" | 82 | label="Notify when Linden dollars (L$) spent or received" left="151" |