aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt7
-rw-r--r--linden/indra/newview/llnetmap.cpp13
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml3
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml6
4 files changed, 20 insertions, 9 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index b174987..4c9a14c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,6 +5,13 @@
5 modified: linden/indra/newview/llnetmap.cpp 5 modified: linden/indra/newview/llnetmap.cpp
6 modified: linden/indra/newview/llnetmap.h 6 modified: linden/indra/newview/llnetmap.h
7 modified: linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml 7 modified: linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
8
9
10 * Moved mini-map tooltips to XML, added panning tooltip.
11
12 modified: linden/indra/newview/llnetmap.cpp
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
8 15
9 16
102009-06-12 McCabe Maxsted <hakushakukun@gmail.com> 172009-06-12 McCabe Maxsted <hakushakukun@gmail.com>
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 85b0f28..c107256 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -536,6 +536,12 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
536 msg.append("\n"); 536 msg.append("\n");
537 } 537 }
538 msg.append( region->getName() ); 538 msg.append( region->getName() );
539
540 msg.append("\n");
541 msg.append(getString("tooltip_1"));
542 msg.append("\n");
543 msg.append(getString("tooltip_2"));
544
539 545
540#ifndef LL_RELEASE_FOR_DOWNLOAD 546#ifndef LL_RELEASE_FOR_DOWNLOAD
541 std::string buffer; 547 std::string buffer;
@@ -546,13 +552,6 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
546 buffer = region->getHost().getString(); 552 buffer = region->getHost().getString();
547 msg.append(buffer); 553 msg.append(buffer);
548#endif 554#endif
549 // *TODO:
550 // - put this under the control of XUI so it can be translated.
551
552 if ( gSavedSettings.getBOOL( "MiniMapTeleport" ))
553 msg.append("\n(Double-click to teleport)");
554 else
555 msg.append("\n(Double-click to open Map)");
556 555
557 S32 SLOP = 4; 556 S32 SLOP = 4;
558 localPointToScreen( 557 localPointToScreen(
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 1b31afa..9f1e164 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -3,6 +3,5 @@
3 can_tear_off="false" follows="top|right" height="220" min_height="64" min_width="64" 3 can_tear_off="false" follows="top|right" height="220" min_height="64" min_width="64"
4 name="minimap" rect_control="FloaterMiniMapRect" width="200"> 4 name="minimap" rect_control="FloaterMiniMapRect" width="200">
5 <panel bottom="2" follows="left|top|right|bottom" height="216" label="Mini Map" 5 <panel bottom="2" follows="left|top|right|bottom" height="216" label="Mini Map"
6 left="2" mouse_opaque="false" name="mini_mapview" 6 left="2" mouse_opaque="false" name="mini_mapview" width="196" />
7 width="196" />
8</floater> 7</floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
index a74782c..dbd93f5 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_mini_map.xml
@@ -50,4 +50,10 @@
50 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21"> 50 text_enabled_color="1, 1, 1, 0.7" v_pad="0" width="21">
51 NW 51 NW
52 </text> 52 </text>
53 <string name="tooltip_1">
54 Double-Cick to Teleport
55 </string>
56 <string name="tooltip_2">
57 Shift-Drag to Pan
58 </string>
53</panel> 59</panel>