Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
1660cac8
Commit
1660cac8
authored
1 year ago
by
Andrey Kleshchev
Browse files
Options
Downloads
Patches
Plain Diff
SL-20243 Make viewer notice 403 from release-notes URL and handle it
parent
ce4ff7b5
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llstartup.cpp
+33
-2
33 additions, 2 deletions
indra/newview/llstartup.cpp
with
33 additions
and
2 deletions
indra/newview/llstartup.cpp
+
33
−
2
View file @
1660cac8
...
@@ -2419,6 +2419,34 @@ void login_callback(S32 option, void *userdata)
...
@@ -2419,6 +2419,34 @@ void login_callback(S32 option, void *userdata)
}
}
}
}
void
release_notes_coro
(
const
std
::
string
url
)
{
if
(
url
.
empty
())
{
return
;
}
LLCore
::
HttpRequest
::
policy_t
httpPolicy
(
LLCore
::
HttpRequest
::
DEFAULT_POLICY_ID
);
LLCoreHttpUtil
::
HttpCoroutineAdapter
::
ptr_t
httpAdapter
(
new
LLCoreHttpUtil
::
HttpCoroutineAdapter
(
"releaseNotesCoro"
,
httpPolicy
));
LLCore
::
HttpRequest
::
ptr_t
httpRequest
(
new
LLCore
::
HttpRequest
);
LLCore
::
HttpOptions
::
ptr_t
httpOpts
=
LLCore
::
HttpOptions
::
ptr_t
(
new
LLCore
::
HttpOptions
);
httpOpts
->
setHeadersOnly
(
true
);
// only making sure it isn't 404 or something like that
LLSD
result
=
httpAdapter
->
getAndSuspend
(
httpRequest
,
url
,
httpOpts
);
LLSD
httpResults
=
result
[
LLCoreHttpUtil
::
HttpCoroutineAdapter
::
HTTP_RESULTS
];
LLCore
::
HttpStatus
status
=
LLCoreHttpUtil
::
HttpCoroutineAdapter
::
getStatusFromLLSD
(
httpResults
);
if
(
!
status
)
{
return
;
}
LLWeb
::
loadURLInternal
(
url
);
}
/**
/**
* Check if user is running a new version of the viewer.
* Check if user is running a new version of the viewer.
* Display the Release Notes if it's not overriden by the "UpdaterShowReleaseNotes" setting.
* Display the Release Notes if it's not overriden by the "UpdaterShowReleaseNotes" setting.
...
@@ -2451,7 +2479,8 @@ void show_release_notes_if_required()
...
@@ -2451,7 +2479,8 @@ void show_release_notes_if_required()
LLEventPumps
::
instance
().
obtain
(
"relnotes"
).
listen
(
LLEventPumps
::
instance
().
obtain
(
"relnotes"
).
listen
(
"showrelnotes"
,
"showrelnotes"
,
[](
const
LLSD
&
url
)
{
[](
const
LLSD
&
url
)
{
LLWeb
::
loadURLInternal
(
url
.
asString
());
LLCoros
::
instance
().
launch
(
"releaseNotesCoro"
,
boost
::
bind
(
&
release_notes_coro
,
url
.
asString
()));
return
false
;
return
false
;
});
});
}
}
...
@@ -2459,7 +2488,9 @@ void show_release_notes_if_required()
...
@@ -2459,7 +2488,9 @@ void show_release_notes_if_required()
#endif // LL_RELEASE_FOR_DOWNLOAD
#endif // LL_RELEASE_FOR_DOWNLOAD
{
{
LLSD
info
(
LLAppViewer
::
instance
()
->
getViewerInfo
());
LLSD
info
(
LLAppViewer
::
instance
()
->
getViewerInfo
());
LLWeb
::
loadURLInternal
(
info
[
"VIEWER_RELEASE_NOTES_URL"
]);
std
::
string
url
=
info
[
"VIEWER_RELEASE_NOTES_URL"
].
asString
();
LLCoros
::
instance
().
launch
(
"releaseNotesCoro"
,
boost
::
bind
(
&
release_notes_coro
,
url
));
}
}
release_notes_shown
=
true
;
release_notes_shown
=
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment