aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatergodtools.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloatergodtools.h')
-rw-r--r--linden/indra/newview/llfloatergodtools.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloatergodtools.h b/linden/indra/newview/llfloatergodtools.h
index 31ba18e..75813ca 100644
--- a/linden/indra/newview/llfloatergodtools.h
+++ b/linden/indra/newview/llfloatergodtools.h
@@ -17,7 +17,8 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -201,11 +202,11 @@ public:
201 void refresh(); 202 void refresh();
202 203
203 static void onClickKickAll(void *data); 204 static void onClickKickAll(void *data);
204 static void confirmKick(S32 option, const std::string& text, void* userdata); 205 static bool confirmKick(const LLSD& notification, const LLSD& response);
205 static void finishKick(S32 option, void* userdata); 206 static bool finishKick(const LLSD& notification, const LLSD& response);
206 static void onDragSunPhase(LLUICtrl *ctrl, void *userdata); 207 static void onDragSunPhase(LLUICtrl *ctrl, void *userdata);
207 static void onClickFlushMapVisibilityCaches(void* data); 208 static void onClickFlushMapVisibilityCaches(void* data);
208 static void flushMapVisibilityCachesConfirm(S32 option, void* data); 209 static bool flushMapVisibilityCachesConfirm(const LLSD& notification, const LLSD& response);
209 210
210protected: 211protected:
211 std::string mKickMessage; // Message to send on kick 212 std::string mKickMessage; // Message to send on kick
@@ -240,7 +241,7 @@ public:
240 static void onClickDeletePublicOwnedBy(void* data); 241 static void onClickDeletePublicOwnedBy(void* data);
241 static void onClickDeleteAllScriptedOwnedBy(void* data); 242 static void onClickDeleteAllScriptedOwnedBy(void* data);
242 static void onClickDeleteAllOwnedBy(void* data); 243 static void onClickDeleteAllOwnedBy(void* data);
243 static void callbackSimWideDeletes(S32 option, void* userdata); 244 static bool callbackSimWideDeletes(const LLSD& notification, const LLSD& response);
244 static void onGetTopColliders(void* data); 245 static void onGetTopColliders(void* data);
245 static void onGetTopScripts(void* data); 246 static void onGetTopScripts(void* data);
246 static void onGetScriptDigest(void* data); 247 static void onGetScriptDigest(void* data);