summaryrefslogtreecommitdiff
path: root/indra/llui/lluictrl.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/lluictrl.h')
-rw-r--r--indra/llui/lluictrl.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llui/lluictrl.h b/indra/llui/lluictrl.h
index 790c483aee..e507178d89 100644
--- a/indra/llui/lluictrl.h
+++ b/indra/llui/lluictrl.h
@@ -284,7 +284,7 @@ public:
LLSINGLETON_EMPTY_CTOR(EnableCallbackRegistry);
};
- struct LLCommitCallbackInfo
+ struct CommitCallbackInfo
{
enum EUntrustedCall
{
@@ -293,16 +293,16 @@ public:
UNTRUSTED_THROTTLE
};
- LLCommitCallbackInfo(commit_callback_t func = NULL, EUntrustedCall handle_untrusted = UNTRUSTED_ALLOW)
- : callback_func(func), mHandleUntrusted(handle_untrusted)
+ CommitCallbackInfo(commit_callback_t func = {}, EUntrustedCall handle_untrusted = UNTRUSTED_ALLOW)
+ : callback_func(func), handle_untrusted(handle_untrusted)
{}
public:
- EUntrustedCall mHandleUntrusted;
commit_callback_t callback_func;
+ EUntrustedCall handle_untrusted;
};
- class SharedCommitCallbackRegistry : public CallbackRegistry<LLCommitCallbackInfo, SharedCommitCallbackRegistry>
+ class SharedCommitCallbackRegistry : public CallbackRegistry<CommitCallbackInfo, SharedCommitCallbackRegistry>
{
LLSINGLETON_EMPTY_CTOR(SharedCommitCallbackRegistry);
};