Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index dfd4af5c28..97f90ac845 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -139,6 +139,7 @@ BOOL LLInventoryPanel::postBuild()
 		p.name = getName();

 		p.rect = folder_rect;

 		p.parent_panel = this;

+		p.tool_tip = p.name;

 		mFolders = LLUICtrlFactory::create<LLFolderView>(p);

 		mFolders->setAllowMultiSelect(mAllowMultiSelect);

 	}

@@ -492,6 +493,7 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
 					p.icon = new_listener->getIcon();

 					p.root = mFolders;

 					p.listener = new_listener;

+					p.tool_tip = p.name;

 					LLFolderViewFolder* folderp = LLUICtrlFactory::create<LLFolderViewFolder>(p);

 				

 					folderp->setItemSortOrder(mFolders->getSortOrder());

@@ -518,6 +520,7 @@ void LLInventoryPanel::buildNewViews(const LLUUID& id)
 					params.root(mFolders);

 					params.listener(new_listener);

 					params.rect(LLRect (0, 0, 0, 0));

+					params.tool_tip = params.name;

 					itemp = LLUICtrlFactory::create<LLFolderViewItem> (params);

 				}

 			}