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
27133e3d
Commit
27133e3d
authored
2 years ago
by
¡Cinder! ㊝
Browse files
Options
Downloads
Patches
Plain Diff
Dogfood for now
parent
050d544a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!89
Legacy notification well for normal folks who don't like checking their...
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/newview/llpanelprofilelegacy.cpp
+13
-0
13 additions, 0 deletions
indra/newview/llpanelprofilelegacy.cpp
indra/newview/skins/default/xui/en/menu_profile_legacy.xml
+6
-0
6 additions, 0 deletions
indra/newview/skins/default/xui/en/menu_profile_legacy.xml
with
19 additions
and
0 deletions
indra/newview/llpanelprofilelegacy.cpp
+
13
−
0
View file @
27133e3d
...
@@ -568,6 +568,14 @@ void LLPanelProfileLegacy::onCommitAction(const LLSD& userdata)
...
@@ -568,6 +568,14 @@ void LLPanelProfileLegacy::onCommitAction(const LLSD& userdata)
LLAvatarActions
::
pay
(
getAvatarId
());
LLAvatarActions
::
pay
(
getAvatarId
());
else
if
(
action
==
"report_abuse"
)
else
if
(
action
==
"report_abuse"
)
LLFloaterReporter
::
showFromObject
(
getAvatarId
());
LLFloaterReporter
::
showFromObject
(
getAvatarId
());
else
if
(
action
==
"upload_sl"
)
{
// *TODO:
}
else
if
(
action
==
"upload_fl"
)
{
// *TODO:
}
else
if
(
action
==
"webprofile"
)
else
if
(
action
==
"webprofile"
)
ALAvatarActions
::
showWebProfile
(
getAvatarId
());
ALAvatarActions
::
showWebProfile
(
getAvatarId
());
else
else
...
@@ -594,6 +602,11 @@ bool LLPanelProfileLegacy::isActionEnabled(const LLSD& userdata)
...
@@ -594,6 +602,11 @@ bool LLPanelProfileLegacy::isActionEnabled(const LLSD& userdata)
action_enabled
=
(
getAvatarId
()
!=
gAgentID
);
action_enabled
=
(
getAvatarId
()
!=
gAgentID
);
else
if
(
check
==
"can_drama"
)
else
if
(
check
==
"can_drama"
)
action_enabled
=
(
getAvatarId
()
!=
gAgentID
);
action_enabled
=
(
getAvatarId
()
!=
gAgentID
);
else
if
(
check
==
"can_upload_pic"
)
{
action_enabled
=
getAvatarId
()
==
gAgentID
&&
!
gAgent
.
getRegionCapability
(
"UploadAgentProfileImage"
).
empty
();
}
else
else
LL_INFOS
(
"LegacyProfiles"
)
<<
"Unhandled check "
<<
check
<<
LL_ENDL
;
LL_INFOS
(
"LegacyProfiles"
)
<<
"Unhandled check "
<<
check
<<
LL_ENDL
;
return
action_enabled
;
return
action_enabled
;
...
...
This diff is collapsed.
Click to expand it.
indra/newview/skins/default/xui/en/menu_profile_legacy.xml
+
6
−
0
View file @
27133e3d
...
@@ -21,6 +21,9 @@
...
@@ -21,6 +21,9 @@
<menu_item_call.on_click
<menu_item_call.on_click
function="Profile.Action"
function="Profile.Action"
parameter="upload_sl"/>
parameter="upload_sl"/>
<menu_item_call.on_enable
function="Profile.Enable"
parameter="can_upload_pic" />
</menu_item_call>
</menu_item_call>
<menu_item_call
<menu_item_call
label="First Life..."
label="First Life..."
...
@@ -28,6 +31,9 @@
...
@@ -28,6 +31,9 @@
<menu_item_call.on_click
<menu_item_call.on_click
function="Profile.Action"
function="Profile.Action"
parameter="upload_fl"/>
parameter="upload_fl"/>
<menu_item_call.on_enable
function="Profile.Enable"
parameter="can_upload_pic" />
</menu_item_call>
</menu_item_call>
</menu>-->
</menu>-->
<menu_item_call
<menu_item_call
...
...
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