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
66de8ba9
Commit
66de8ba9
authored
14 years ago
by
Richard Linden
Browse files
Options
Downloads
Patches
Plain Diff
SOCIAL-551 WIP Add buttons to open people and profile windows
added LLAvatarActions::profileVisible and hideProfile
parent
cc337162
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/llavataractions.cpp
+32
-1
32 additions, 1 deletion
indra/newview/llavataractions.cpp
indra/newview/llavataractions.h
+2
-0
2 additions, 0 deletions
indra/newview/llavataractions.h
with
34 additions
and
1 deletion
indra/newview/llavataractions.cpp
+
32
−
1
View file @
66de8ba9
...
@@ -47,6 +47,7 @@
...
@@ -47,6 +47,7 @@
#include
"llfloatergroups.h"
#include
"llfloatergroups.h"
#include
"llfloaterreg.h"
#include
"llfloaterreg.h"
#include
"llfloaterpay.h"
#include
"llfloaterpay.h"
#include
"llfloaterwebcontent.h"
#include
"llfloaterworldmap.h"
#include
"llfloaterworldmap.h"
#include
"llgiveinventory.h"
#include
"llgiveinventory.h"
#include
"llinventorybridge.h"
#include
"llinventorybridge.h"
...
@@ -315,7 +316,7 @@ void LLAvatarActions::showProfile(const LLUUID& id)
...
@@ -315,7 +316,7 @@ void LLAvatarActions::showProfile(const LLUUID& id)
std
::
string
agent_name
=
LLCacheName
::
buildUsername
(
full_name
);
std
::
string
agent_name
=
LLCacheName
::
buildUsername
(
full_name
);
llinfos
<<
"opening web profile for "
<<
agent_name
<<
llendl
;
llinfos
<<
"opening web profile for "
<<
agent_name
<<
llendl
;
std
::
string
url
=
getProfileURL
(
agent_name
);
std
::
string
url
=
getProfileURL
(
agent_name
);
LLWeb
::
loadWebURLInternal
(
url
);
LLWeb
::
loadWebURLInternal
(
url
,
""
,
id
.
asString
()
);
}
}
else
else
{
{
...
@@ -336,6 +337,36 @@ void LLAvatarActions::showProfile(const LLUUID& id)
...
@@ -336,6 +337,36 @@ void LLAvatarActions::showProfile(const LLUUID& id)
}
}
}
}
//static
bool
LLAvatarActions
::
profileVisible
(
const
LLUUID
&
id
)
{
LLFloaterWebContent
*
browser
=
dynamic_cast
<
LLFloaterWebContent
*>
(
LLFloaterReg
::
findInstance
(
"web_content"
,
id
.
asString
()));
if
(
browser
)
{
// PROFILES: open in webkit window
std
::
string
full_name
;
if
(
gCacheName
->
getFullName
(
id
,
full_name
))
{
std
::
string
agent_name
=
LLCacheName
::
buildUsername
(
full_name
);
llinfos
<<
"opening web profile for "
<<
agent_name
<<
llendl
;
std
::
string
url
=
getProfileURL
(
agent_name
);
return
url
==
browser
->
getURL
();
}
}
return
false
;
}
//static
void
LLAvatarActions
::
hideProfile
(
const
LLUUID
&
id
)
{
LLFloaterWebContent
*
browser
=
dynamic_cast
<
LLFloaterWebContent
*>
(
LLFloaterReg
::
findInstance
(
"web_content"
,
id
.
asString
()));
if
(
browser
)
{
browser
->
closeFloater
();
}
}
// static
// static
void
LLAvatarActions
::
showOnMap
(
const
LLUUID
&
id
)
void
LLAvatarActions
::
showOnMap
(
const
LLUUID
&
id
)
{
{
...
...
This diff is collapsed.
Click to expand it.
indra/newview/llavataractions.h
+
2
−
0
View file @
66de8ba9
...
@@ -93,6 +93,8 @@ class LLAvatarActions
...
@@ -93,6 +93,8 @@ class LLAvatarActions
* Show avatar profile.
* Show avatar profile.
*/
*/
static
void
showProfile
(
const
LLUUID
&
id
);
static
void
showProfile
(
const
LLUUID
&
id
);
static
void
hideProfile
(
const
LLUUID
&
id
);
static
bool
profileVisible
(
const
LLUUID
&
id
);
/**
/**
* Show avatar on world map.
* Show avatar on world map.
...
...
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