Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Black Dragon Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
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
Logue
Black Dragon Viewer
Commits
6f388f22
Commit
6f388f22
authored
4 years ago
by
Andrey Kleshchev
Committed by
Andrey Lihatskiy
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
SL-13540 Offline scripted inventory offers not shown on non drtsim-451
parent
127f2b39
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/llimprocessing.cpp
+15
-4
15 additions, 4 deletions
indra/newview/llimprocessing.cpp
with
15 additions
and
4 deletions
indra/newview/llimprocessing.cpp
+
15
−
4
View file @
6f388f22
...
...
@@ -865,6 +865,8 @@ void LLIMProcessing::processNewMessage(LLUUID from_id,
{
/*RIDER*/
// The previous version of the protocol returned the wrong binary bucket... we
// still might be able to figure out the type... even though the offer is not retrievable.
// Should be safe to remove once DRTSIM-451 fully deploys
std
::
string
str_bucket
(
reinterpret_cast
<
char
*>
(
binary_bucket
));
std
::
string
str_type
(
str_bucket
.
substr
(
0
,
str_bucket
.
find
(
'|'
)));
...
...
@@ -1575,8 +1577,6 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url)
LL_INFOS
(
"Messaging"
)
<<
"Processing offline messages."
<<
LL_ENDL
;
// std::vector<U8> data;
// S32 binary_bucket_size = 0;
LLHost
sender
=
gAgent
.
getRegionHost
();
LLSD
::
array_iterator
i
=
messages
.
beginArray
();
...
...
@@ -1608,11 +1608,22 @@ void LLIMProcessing::requestOfflineMessagesCoro(std::string url)
bin_bucket
.
push_back
(
0
);
}
// Todo: once drtsim-451 releases, remove the string option
BOOL
from_group
;
if
(
message_data
[
"from_group"
].
isInteger
())
{
from_group
=
message_data
[
"from_group"
].
asInteger
();
}
else
{
from_group
=
message_data
[
"from_group"
].
asString
()
==
"Y"
;
}
LLIMProcessing
::
processNewMessage
(
message_data
[
"from_agent_id"
].
asUUID
(),
message_data
[
"from_group"
].
asBoolean
()
,
from_group
,
message_data
[
"to_agent_id"
].
asUUID
(),
static_cast
<
U8
>
(
message_data
[
"offline"
].
asInteger
()),
message_data
.
has
(
"offline"
)
?
static_cast
<
U8
>
(
message_data
[
"offline"
].
asInteger
())
:
IM_OFFLINE
,
static_cast
<
EInstantMessage
>
(
message_data
[
"dialog"
].
asInteger
()),
message_data
[
"transaction-id"
].
asUUID
(),
static_cast
<
U32
>
(
message_data
[
"timestamp"
].
asInteger
()),
...
...
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