Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.

Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry

1 files changed, 0 insertions, 7 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_map.xml b/indra/newview/skins/default/xui/en/floater_map.xml
index 70f9c19658..dc6a02efe1 100644
--- a/indra/newview/skins/default/xui/en/floater_map.xml
+++ b/indra/newview/skins/default/xui/en/floater_map.xml
@@ -81,7 +81,6 @@
      left="0"
      name="floater_map_east"
      right="10"
-     text="E"
      text_color="1 1 1 0.7"
      top="215">
         E
@@ -95,7 +94,6 @@
      left="0"
      name="floater_map_west"
      right="11"
-     text="W"
      text_color="1 1 1 0.7"
      top="215">
         W
@@ -109,7 +107,6 @@
      left="0"
      name="floater_map_south"
      right="10"
-     text="S"
      text_color="1 1 1 0.7"
      top="215">
         S
@@ -123,7 +120,6 @@
      left="0"
      name="floater_map_southeast"
      right="20"
-     text="SE"
      text_color="1 1 1 0.7"
      top="215">
         SE
@@ -137,7 +133,6 @@
      left="0"
      name="floater_map_northeast"
      right="20"
-     text="NE"
      text_color="1 1 1 0.7"
      top="215">
         NE
@@ -151,7 +146,6 @@
      left="0"
      name="floater_map_southwest"
      right="20"
-     text="SW"
      text_color="1 1 1 0.7"
      top="215">
         SW
@@ -165,7 +159,6 @@
      left="0"
      name="floater_map_northwest"
      right="20"
-     text="NW"
      text_color="1 1 1 0.7"
      top="215">
         NW