From 6861520a356d0df682c8b8f9d5290b3e4c1f0f3d Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Mon, 11 Apr 2011 10:47:31 -0500 Subject: [PATCH] Fix compile errors. --- indra/newview/fsareasearch.cpp | 9 ++++----- indra/newview/fsareasearch.h | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp index e108e22376..3a5f4a8f7b 100644 --- a/indra/newview/fsareasearch.cpp +++ b/indra/newview/fsareasearch.cpp @@ -123,10 +123,9 @@ void FSAreaSearch::checkRegion() } } -void FSAreaSearch::onDoubleClick(void *userdata) +void FSAreaSearch::onDoubleClick() { - FSAreaSearch *self = (FSAreaSearch*)userdata; - LLScrollListItem *item = self->mResultList->getFirstSelected(); + LLScrollListItem *item = mResultList->getFirstSelected(); if (!item) return; LLUUID object_id = item->getUUID(); LLViewerObject* objectp = gObjectList.findObject(object_id); @@ -136,7 +135,7 @@ void FSAreaSearch::onDoubleClick(void *userdata) } } -void FSAreaSearch::cancel(void* data) +void FSAreaSearch::cancel() { checkRegion(); closeFloater(); @@ -147,7 +146,7 @@ void FSAreaSearch::cancel(void* data) mSearchedGroup = ""; } -void FSAreaSearch::search(void* data) +void FSAreaSearch::search() { checkRegion(); results(); diff --git a/indra/newview/fsareasearch.h b/indra/newview/fsareasearch.h index eccd8075eb..27bc95ff7a 100644 --- a/indra/newview/fsareasearch.h +++ b/indra/newview/fsareasearch.h @@ -65,11 +65,11 @@ public: private: void results(); void checkRegion(); - void cancel(void* data); - void search(void* data); + void cancel(); + void search(); void onCommitLine(class LLLineEditor* line, void* user_data); void requestIfNeeded(class LLViewerObject *objectp); - void onDoubleClick(void *userdata); + void onDoubleClick(); enum OBJECT_COLUMN_ORDER {