diff options
| author | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-31 14:31:58 -0800 |
| commit | eb5a76996a1b1ce2ef30b6106287caae998dcc85 (patch) | |
| tree | c796af5a77c8ebfa7d9d09709c0b179e721490c8 /indra/newview/llfloaterreporter.h | |
| parent | 4e23ae312f0ab59c0c8c5b55c6c8450adf7d7f82 (diff) | |
| parent | 6f66ec64b9e360a002a6d658327b72aaaab9325a (diff) | |
Merge (viewer-2-0 into gooey)
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; |