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/llui/llscrollbar.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'indra/llui/llscrollbar.h') diff --git a/indra/llui/llscrollbar.h b/indra/llui/llscrollbar.h index 7e88b16561..e4c5712fb7 100644 --- a/indra/llui/llscrollbar.h +++ b/indra/llui/llscrollbar.h @@ -164,9 +164,6 @@ private: LLUIImagePtr mTrackImageH; S32 mThickness; - - void (*mOnScrollEndCallback)(void*); - void *mOnScrollEndData; }; -- cgit v1.2.3