diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-12-30 00:45:11 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-12-30 00:45:11 -0500 |
| commit | f4e2287175ab1bc9d09fc73435a828071b9e2ba5 (patch) | |
| tree | a3e863efea52678e6ea3f19302bef1d5500fcf42 /indra/newview/llfloaterreporter.h | |
| parent | 904de223b6da701e2512b8d8bf0d3be478421c78 (diff) | |
| parent | 383cb255e0ff619fa4ee3fc0b1dc6a37643d3bc1 (diff) | |
automated merge PE->viewer2.0
Diffstat (limited to 'indra/newview/llfloaterreporter.h')
| -rw-r--r-- | indra/newview/llfloaterreporter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h index a3776f3d27..cc2dfb2f98 100644 --- a/indra/newview/llfloaterreporter.h +++ b/indra/newview/llfloaterreporter.h @@ -97,7 +97,7 @@ public: static void onClickSend (void *userdata); static void onClickCancel (void *userdata); static void onClickObjPicker (void *userdata); - static void onClickSelectAbuser (void *userdata); + void onClickSelectAbuser (); static void closePickTool (void *userdata); static void uploadDoneCallback(const LLUUID &uuid, void* user_data, S32 result, LLExtStat ext_status); static void addDescription(const std::string& description, LLMeanCollisionData *mcd = NULL); @@ -120,7 +120,7 @@ private: void setPosBox(const LLVector3d &pos); void enableControls(BOOL own_avatar); void getObjectInfo(const LLUUID& object_id); - static void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data); + void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); private: EReportType mReportType; |