From ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 Mon Sep 17 00:00:00 2001 From: James Cook Date: Sat, 3 Oct 2009 23:40:28 +0000 Subject: 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 --- indra/newview/llpanelpick.cpp | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'indra/newview/llpanelpick.cpp') diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index 5df3d4f1d6..424e453a2f 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -356,14 +356,7 @@ std::string LLPanelPick::createLocationText(const std::string& owner_name, const void LLPanelPick::setPickName(std::string name) { - if (mEditMode) - { - childSetValue(XML_NAME, name); - } - else - { - childSetWrappedText(XML_NAME, name); - } + childSetValue(XML_NAME, name); //preserving non-wrapped text for info/edit modes switching mName = name; @@ -371,14 +364,7 @@ void LLPanelPick::setPickName(std::string name) void LLPanelPick::setPickDesc(std::string desc) { - if (mEditMode) - { - childSetValue(XML_DESC, desc); - } - else - { - childSetWrappedText(XML_DESC, desc); - } + childSetValue(XML_DESC, desc); //preserving non-wrapped text for info/edit modes switching mDesc = desc; @@ -386,7 +372,7 @@ void LLPanelPick::setPickDesc(std::string desc) void LLPanelPick::setPickLocation(const std::string& location) { - childSetWrappedText(XML_LOCATION, location); + childSetValue(XML_LOCATION, location); //preserving non-wrapped text for info/edit modes switching mLocation = location; -- cgit v1.2.3