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
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
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
Alchemy Archive
Alchemy Viewer
Commits
5fbd84a2
Commit
5fbd84a2
authored
9 years ago
by
Rider Linden
Browse files
Options
Downloads
Patches
Plain Diff
Parcel Media and Viewer Parcel Mgr to generic coroutines.
parent
46a86ddb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llviewerparcelmedia.cpp
+5
-1
5 additions, 1 deletion
indra/newview/llviewerparcelmedia.cpp
indra/newview/llviewerparcelmgr.cpp
+9
-3
9 additions, 3 deletions
indra/newview/llviewerparcelmgr.cpp
with
14 additions
and
4 deletions
indra/newview/llviewerparcelmedia.cpp
+
5
−
1
View file @
5fbd84a2
...
...
@@ -43,6 +43,7 @@
//#include "llfirstuse.h"
#include
"llpluginclassmedia.h"
#include
"llviewertexture.h"
#include
"llcorehttputil.h"
// Static Variables
...
...
@@ -457,6 +458,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
}
// Static
/////////////////////////////////////////////////////////////////////////////////////////
// *TODO: I can not find any active code where this method is called...
void
LLViewerParcelMedia
::
sendMediaNavigateMessage
(
const
std
::
string
&
url
)
{
std
::
string
region_url
=
gAgent
.
getRegion
()
->
getCapability
(
"ParcelNavigateMedia"
);
...
...
@@ -467,7 +469,9 @@ void LLViewerParcelMedia::sendMediaNavigateMessage(const std::string& url)
body
[
"agent-id"
]
=
gAgent
.
getID
();
body
[
"local-id"
]
=
LLViewerParcelMgr
::
getInstance
()
->
getAgentParcel
()
->
getLocalID
();
body
[
"url"
]
=
url
;
LLHTTPClient
::
post
(
region_url
,
body
,
new
LLHTTPClient
::
Responder
);
LLCoreHttpUtil
::
HttpCoroutineAdapter
::
messageHttpPost
(
region_url
,
body
,
"Media Navigation sent to sim."
,
"Media Navigation failed to send to sim."
);
}
else
{
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llviewerparcelmgr.cpp
+
9
−
3
View file @
5fbd84a2
...
...
@@ -67,6 +67,7 @@
#include
"roles_constants.h"
#include
"llweb.h"
#include
"llvieweraudio.h"
#include
"llcorehttputil.h"
const
F32
PARCEL_COLLISION_DRAW_SECS
=
1.
f
;
...
...
@@ -1278,10 +1279,13 @@ const std::string& LLViewerParcelMgr::getAgentParcelName() const
void
LLViewerParcelMgr
::
sendParcelPropertiesUpdate
(
LLParcel
*
parcel
,
bool
use_agent_region
)
{
if
(
!
parcel
)
return
;
if
(
!
parcel
)
return
;
LLViewerRegion
*
region
=
use_agent_region
?
gAgent
.
getRegion
()
:
LLWorld
::
getInstance
()
->
getRegionFromPosGlobal
(
mWestSouth
);
if
(
!
region
)
return
;
if
(
!
region
)
return
;
//LL_INFOS() << "found region: " << region->getName() << LL_ENDL;
LLSD
body
;
...
...
@@ -1294,7 +1298,9 @@ void LLViewerParcelMgr::sendParcelPropertiesUpdate(LLParcel* parcel, bool use_ag
parcel
->
packMessage
(
body
);
LL_INFOS
()
<<
"Sending parcel properties update via capability to: "
<<
url
<<
LL_ENDL
;
LLHTTPClient
::
post
(
url
,
body
,
new
LLHTTPClient
::
Responder
());
LLCoreHttpUtil
::
HttpCoroutineAdapter
::
messageHttpPost
(
url
,
body
,
"Parcel Properties sent to sim."
,
"Parcel Properties failed to send to sim."
);
}
else
{
...
...
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