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
2cc76d0b
Commit
2cc76d0b
authored
3 years ago
by
Andrey Kleshchev
Browse files
Options
Downloads
Patches
Plain Diff
SL-14388 Listing status issues
Log issue and try to recover
parent
9a168832
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llmarketplacefunctions.cpp
+19
-0
19 additions, 0 deletions
indra/newview/llmarketplacefunctions.cpp
indra/newview/llviewerjoystick.h
+1
-0
1 addition, 0 deletions
indra/newview/llviewerjoystick.h
with
20 additions
and
0 deletions
indra/newview/llmarketplacefunctions.cpp
+
19
−
0
View file @
2cc76d0b
...
...
@@ -1025,6 +1025,12 @@ void LLMarketplaceData::createSLMListingCoro(LLUUID folderId, LLUUID versionId,
log_SLM_infos
(
"Post /listings"
,
status
.
getType
(),
result
);
if
(
!
result
.
has
(
"listings"
)
||
!
result
[
"listings"
].
isArray
()
||
result
[
"listings"
].
size
()
==
0
)
{
LL_INFOS
(
"SLM"
)
<<
"Received an empty response for folder "
<<
folderId
<<
LL_ENDL
;
return
;
}
// Extract the info from the results
for
(
LLSD
::
array_iterator
it
=
result
[
"listings"
].
beginArray
();
it
!=
result
[
"listings"
].
endArray
();
++
it
)
...
...
@@ -1092,6 +1098,19 @@ void LLMarketplaceData::updateSLMListingCoro(LLUUID folderId, S32 listingId, LLU
log_SLM_infos
(
"Put /listing"
,
status
.
getType
(),
result
);
if
(
!
result
.
has
(
"listings"
)
||
!
result
[
"listings"
].
isArray
()
||
result
[
"listings"
].
size
()
==
0
)
{
LL_INFOS
(
"SLM"
)
<<
"Received an empty response for listing "
<<
listingId
<<
" folder "
<<
folderId
<<
LL_ENDL
;
// Try to get listing more directly after a delay
const
float
FORCE_UPDATE_TIMEOUT
=
5.0
;
llcoro
::
suspendUntilTimeout
(
FORCE_UPDATE_TIMEOUT
);
if
(
!
LLApp
::
isExiting
()
&&
LLMarketplaceData
::
instanceExists
())
{
getSLMListing
(
listingId
);
}
return
;
}
// Extract the info from the Json string
for
(
LLSD
::
array_iterator
it
=
result
[
"listings"
].
beginArray
();
it
!=
result
[
"listings"
].
endArray
();
++
it
)
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llviewerjoystick.h
+
1
−
0
View file @
2cc76d0b
...
...
@@ -47,6 +47,7 @@ class LLViewerJoystick : public LLSingleton<LLViewerJoystick>
{
LLSINGLETON
(
LLViewerJoystick
);
virtual
~
LLViewerJoystick
();
LOG_CLASS
(
LLViewerJoystick
);
public:
void
init
(
bool
autoenable
);
...
...
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