diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-02-08 17:18:37 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-02-08 17:18:37 +0100 |
| commit | 77afc073c54d6d03b7a24276a08d1924372058d0 (patch) | |
| tree | 95f472eabe4407cca653af3a867808f32402551c /indra/newview/llstartup.cpp | |
| parent | 5805bbd8104e66fb9ae7ed3c22e374e377b2f2e1 (diff) | |
| parent | 4df2c0b8d67af267d3c9c6d58d63df3ed063a89e (diff) | |
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 1dd5c5cbe5..6883ead5ee 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -272,12 +272,10 @@ void show_first_run_dialog(); bool first_run_dialog_callback(const LLSD& notification, const LLSD& response); void set_startup_status(const F32 frac, const std::string& string, const std::string& msg); bool login_alert_status(const LLSD& notification, const LLSD& response); -void login_packet_failed(void**, S32 result); void use_circuit_callback(void**, S32 result); void register_viewer_callbacks(LLMessageSystem* msg); void asset_callback_nothing(const LLUUID&, LLAssetType::EType, void*, S32); bool callback_choose_gender(const LLSD& notification, const LLSD& response); -void init_start_screen(S32 location_id); void release_start_screen(); void reset_login(); LLSD transform_cert_args(LLPointer<LLCertificate> cert); |